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

src/main/java/com/style24/front/biz/service/TsfReviewService.java

@@ -358,7 +358,26 @@ public class TsfReviewService {
 	 * @since 2021. 3. 26
 	 */
 	public Collection<Review> getAlreadyReviewList(Review review){
-		return reviewDao.getAlreadyReviewList(review);
+		Collection<Review> reviewList = new ArrayList<>();
+		
+		for (Review tmpReview : reviewDao.getAlreadyReviewList(review)) {
+			// 세트상품 옵션별 배열로 담기
+			if (tmpReview.getItemNm().contains("!@!")) {
+				tmpReview.setItemNmArr(tmpReview.getItemNm().split("!@!"));
+				tmpReview.setColorNmArr(tmpReview.getColorNm().split(","));
+				tmpReview.setOptCd1Arr(tmpReview.getOptCd1().split(","));
+				tmpReview.setOptCd2Arr(tmpReview.getOptCd2().split(","));
+			} else {
+				String[] arr = {tmpReview.getItemNm()}, arr2 = {tmpReview.getColorNm()}, arr3 = {tmpReview.getOptCd1()}, arr4 = {tmpReview.getOptCd2()};
+				tmpReview.setItemNmArr(arr);
+				tmpReview.setColorNmArr(arr2);
+				tmpReview.setOptCd1Arr(arr3);
+				tmpReview.setOptCd2Arr(arr4);
+			}
+			reviewList.add(tmpReview);
+		}
+		
+		return reviewList;
 	}
 	
 	/**

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

@@ -348,7 +348,7 @@
 		<include refid="selectForPagingHeader"/>
 		SELECT GROUP_CONCAT(Z.ITEM_NM ORDER BY Z.ORD_DTL_ITEM_SQ SEPARATOR '!@!') AS ITEM_NM
 		     -- , GROUP_CONCAT(Z.COLOR_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
-		     , GROUP_CONCAT(CONCAT(OPT_CD1_NM,'/', OPT_CD2) ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
+		     , GROUP_CONCAT(' ',CONCAT(OPT_CD1_NM,'/', OPT_CD2) ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
 		     , GROUP_CONCAT(Z.OPT_CD1 ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD1
 		     , GROUP_CONCAT(Z.OPT_CD2 ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD2
 		     , GROUP_CONCAT(Z.OPT_CD1_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD1_NM
@@ -480,7 +480,7 @@
 		/* TsfReivew.getReviewGoodsInfo */
 		SELECT GROUP_CONCAT(Z.ITEM_NM ORDER BY Z.ORD_DTL_ITEM_SQ SEPARATOR '!@!') AS ITEM_NM
 		  -- , GROUP_CONCAT(Z.COLOR_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
-		     , GROUP_CONCAT(CONCAT(OPT_CD1_NM,'/', OPT_CD2) ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
+		     , GROUP_CONCAT(CONCAT(' ',OPT_CD1_NM,'/', OPT_CD2) ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
 		     , GROUP_CONCAT(Z.OPT_CD1 ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD1
 		     , GROUP_CONCAT(Z.OPT_CD2 ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD2
 		     , GROUP_CONCAT(Z.OPT_CD1_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD1_NM
@@ -904,12 +904,12 @@
 		)F
 	</select>
 	
-	<select id="getAlreadyReviewList" parameterType="Review" resultType="Goods">
+	<select id="getAlreadyReviewList" parameterType="Review" resultType="Review">
 		/* TsfReivew.getAlreadyReviewList */
 		<include refid="selectForPagingHeader"/>
 		        SELECT GROUP_CONCAT(Z.ITEM_NM ORDER BY Z.ORD_DTL_ITEM_SQ SEPARATOR '!@!') AS ITEM_NM
 		          -- , GROUP_CONCAT(Z.COLOR_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
-		             , GROUP_CONCAT(CONCAT(OPT_CD1_NM,'/', OPT_CD2) ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
+		             , GROUP_CONCAT(' ',CONCAT(OPT_CD1_NM,'/', OPT_CD2) ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
 		             , GROUP_CONCAT(Z.OPT_CD1 ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD1
 		             , GROUP_CONCAT(Z.OPT_CD2 ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD2
 		             , GROUP_CONCAT(Z.OPT_CD1_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD1_NM

src/main/webapp/WEB-INF/views/web/mypage/MypageReviewFormWeb.html

@@ -232,7 +232,13 @@
 				html+='						<div class="gd_opt">';
 				html+='							<div class="option_wrap">';
 				html+='								<span class="title sr-only">주문 옵션</span>';
-				html+='								<span class="option">'+item.colorNm+'</span>';
+				if (item.goodsType =='G056_S') {
+					$.each(item.colorNmArr, function (index2, option) {
+						html += '							<span class="option">' + item.itemNmArr[index2] + ' / ' + option + ' / ' + item.optCd2Arr[index2] + '</span>\n';
+					})
+				}else{
+					html += '							<span class="option">'+item.colorNm+'</span>     ';
+				}
 				html+='							</div>';
 				html+='						</div>';
 				html+='					</div>';

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

@@ -1,147 +0,0 @@
-/*
- * Summernote Java Script written by gagamel.
- *
- * Copyright (c) 2010 gagamel
- * Dual licensed under GPL (GPL-LICENSE.txt) licenses.
- *
- * $Date: 2020-10-29 $
- *
- * 사용 예)
- * 		// HTML 태그는 textarea로 구성
- * 		// id는 gagaSn.summernote 함수 호출 시에 넘겨줘야 한다.
- * 		<textarea class="textareaR4" name="clauseContent" id="clauseContent"></textarea>
- *
- * 		// Import할 자바스크립트 파일
- * 		<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=2020102902"></script>
- *
- * 		<script type="text/javascript">
- * 			// Get a summernote options
- * 			var snOptions = gagaSn.getToolbarOptions();
- *
- * 			$(document).ready(function() {
- * 				// Create a summernote
- * 				gagaSn.createSummernote(snOptions, '#clauseContent');
- * 			});
- * 		</script>
- */
-
-var gagaSn = {
-	/**
-	 * Get a Toolbar options
-	 * @param type - 유형(default, media: 사진/동영상 업로드)
-	 */
-	getToolbarOptions : function(type) {
-		if (typeof(type) == 'undefined' || type == 'default') {
-			return [
-				['style', ['style']],
-				//['Font Style', ['fontname']], <!-- 210309 삭제 -->
-				['fontsize', ['fontsize']],
-				['height', ['height']],
-				['style', ['bold', 'italic', 'underline','clear']],
-				['font', ['strikethrough', 'superscript', 'subscript']],
-				['color', ['color']],
-				['para', ['ul', 'ol', 'paragraph']],
-				['Insert', ['table']],
-				['Insert', ['link']],
-				['misc', [ 'print']], //  프린트
-				['code', ['fullscreen', 'codeview', 'help']]
-			];
-		} else if (type == 'media') {
-			return [
-				['style', ['style']],
-				//['Font Style', ['fontname']], <!-- 210309 삭제 -->
-				['fontsize', ['fontsize']],
-				['height', ['height']],
-				['style', ['bold', 'italic', 'underline','clear']],
-				['font', ['strikethrough', 'superscript', 'subscript']],
-				['color', ['color']],
-				['para', ['ul', 'ol', 'paragraph']],
-				['Insert', ['table']],
-				['Insert', ['link', 'picture', 'video']],
-				['misc', [ 'print']], // 프린트
-				['code', ['fullscreen', 'codeview', 'help']]
-			];
-		}
-	},
-
-	/**
-	 * Create a summernote
-	 * @param toolbarOptions - 툴바옵션
-	 * @param editorId - 에디터 ID
-	 * @param editorHeight - 에디터 height
-	 */
-	createSummernote : function(toolbarOptions, editorId, editorHeight) {
-		if (typeof(editorHeight) == 'undefined') editorHeight = 300;
-		
-		$(editorId).summernote({
-			disableDragAndDrop: true, //drag&drop 사용안함
-			placeholder: '내용을 입력하세요',
-			height: editorHeight, //에디터 기본 높이
-			lang : 'ko-KR', //기본 언어 인코딩
-			//fontNames: ['Malgun Gothic', 'HY견고딕', 'Helvetica', 'Verdana', 'Arial', 'Arial Black'], //폰트 스타일  <!-- 210309 삭제 -->
-			//fontNamesIgnoreCheck: ['Malgun Gothic'], //기본폰트 스타일  <!-- 210309 삭제 -->
-			fontNames: ['Noto Sans kr'], //폰트 스타일  <!-- 210309 수정 -->
-			fontNamesIgnoreCheck: ['Noto Sans kr'], //기본폰트 스타일  <!-- 210309 수정 -->
-			focus: false, //로드시 에디터창에 포커싱
-			fontSizes: ['8','9','10','11','12','13','14','15','16','17','18','19','20','24','30','36'],
-			toolbar: toolbarOptions,
-			callbacks: {
-				onImageUpload: function(files) { // 이미지 업로드
-					for (var i = 0; i < files.length; i++) {
-						uploadImage(files[i], this);
-					}
-				},
-				onPaste: function(e) {
-					var clipboardData = e.originalEvent.clipboardData;
-					if (clipboardData && clipboardData.items && clipboardData.items.length) {
-						var item = clipboardData.items[0];
-						if (item.kind === 'file' && item.type.indexOf('image/') !== -1) {
-							e.preventDefault();
-						}
-					}
-				}
-			}
-		});
-	},
-
-	/**
-	 * Set value to summernote
-	 */
-	setContents : function(editorId, content) {
-		var content = content.replaceAll("&lt;", "<").replaceAll("&gt;",">");
-
-		try {
-			$(editorId).summernote('code', content);
-		} catch(e) {
-			// Do nothing
-		}
-	},
-	
-	uploadImage : function(file, editorId) {
-		var formData = new FormData();
-		formData.append("file", file);
-		formData.append("policy", image);
-		
-		$.ajax({
-			data : formData,
-			type : 'POST',
-			url : '/common/file/upload?subDir=/editor',
-			cache : false,
-			contentType : false,
-			enctype : 'multipart/form-data',
-			processData : false,
-			success : function(data) {
-				console.log("================== EDITOR FILE UPLOAD ===================");
-				console.log("viewUrl : " + data.viewUrl);
-				console.log("viewPath : " + data.viewPath);
-				console.log("oldFileNm : " + data.oldFileNm);
-				console.log("newFileNm : " + data.newFileNm);
-				console.log("filePath : " + data.filePath);
-				console.log("================== // EDITOR FILE UPLOAD ===================");
-				$(editorId).summernote('insertImage', data.viewPath);
-			}
-		});
-	}
-
-}