Merge branch 'develop' into eskim

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

@@ -392,26 +392,18 @@
 		               AND    EXP_CMP_DT IS NOT NULL
 		               ), 0)                           AS EXPIRE_PNT_AMT -- 소멸포인트
 		     , IFNULL((
-		               SELECT SUM(A.PNT_AMT + B.PNT_AMT) AS PNT_AMT
-		               FROM (
-		                     SELECT SUM(PNT_AMT) AS PNT_AMT
-		                          , ORD_NO
-		                     FROM   TB_CUST_POINT_HST
-		                     WHERE  OCCUR_GB = 'G069_12' -- 적립예정
-		                     AND    PNT_UPLOAD_STAT = 'G070_10' -- 포인트반영
-		                     AND    CUST_NO = #{custNo}
-		                     GROUP BY ORD_NO
-		                    ) A
-		                 , (
-		                    SELECT SUM(PNT_AMT) AS PNT_AMT
-		                         , ORD_NO
-		                    FROM   TB_CUST_POINT_HST
-		                    WHERE  OCCUR_GB = 'G069_13' -- 적립예정취소
-		                    AND    PNT_UPLOAD_STAT = 'G070_20' -- 포인트반영전취소
-		                    AND    CUST_NO = #{custNo}
-		                    GROUP BY ORD_NO
-		                    ) B
-		               WHERE A.ORD_NO = B.ORD_NO
+		               SELECT SUM(CPH.PNT_AMT) AS PNT_AMT
+		               FROM   TB_CUST_POINT_HST CPH
+		               WHERE  CPH.OCCUR_GB IN ('G069_12', 'G069_13')             -- 적립예정, 적립취소
+		               AND    CPH.PNT_UPLOAD_STAT IN ('G070_10', 'G070_20')        -- 반영예정, 반영전취소
+		               AND    CPH.CUST_NO = #{custNo}
+		               AND    NOT EXISTS (
+		                                  SELECT 1
+		                                  FROM  TB_CUST_POINT_HST
+		                                  WHERE PNT_UPLOAD_STAT = 'G070_30'
+		                                  AND   ORD_NO = CPH.ORD_NO
+		                                  AND   ORD_DTL_NO = CPH.ORD_DTL_NO
+		                                  )
 		               ), 0)                           AS EXPECTED_PNT_AMT -- 적립예정포인트
 		     , IFNULL((
 		               SELECT SUM(RM_PNT_AMT) AS RM_PNT_AMT

src/main/webapp/WEB-INF/views/common/fragments/variables.html

@@ -25,6 +25,7 @@ var _imgUrl = [[${@environment.getProperty('domain.image')}]];
 var _sampleUrl = [[${@environment.getProperty('upload.sample.view')}]];
 var _uploadDefaultUrl = [[${@environment.getProperty('upload.default.view')}]];
 var _goodsUrl = [[${@environment.getProperty('upload.goods.view')}]];
+var _kollusMediaUrl = [[${kollusMediaUrl}]];
 
 var _today = [[${#calendars.format(#calendars.createNow(), 'yyyy-MM-dd')}]];
 var _thisYear = [[${#calendars.format(#calendars.createNow(), 'yyyy')}]];

src/main/webapp/WEB-INF/views/display/MainContentsPopupForm.html

@@ -37,6 +37,7 @@
 	</div>
 </div>
 
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.kollus.js"></script>
 <script th:inline="javascript">
 	/*<![CDATA[*/
 	var cateNo = [[${cateNo}]];
@@ -92,7 +93,7 @@
 			html += '</select>';
 			html += '<input name="dispOrd" type="text" class="w80"placeholder="전시순서" style="margin-left:5px; text-align:center"/>';
 			html += '</td>';
-			if(contentsLoc!='SCM002' && contentsLoc!='SCM003'){
+			if(contentsLoc!='SCM002' && contentsLoc!='SCM003' && contentsLoc!='SMM011' && contentsLoc!='SBM012'){
 				html += '<td class="aL">';
 				if(contentsLoc!='SMM005'){
 					html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddTitlePopRow(this);">타이틀추가</button>';
@@ -446,7 +447,7 @@
 		html += '<input name="dispOrd" type="text" class="w80"placeholder="전시순서" style="margin-left:5px; text-align:center"/>';
 		html += '</td>';
 		html += '<td class="aL">';
-		if(contentsLoc!='SCM002' && contentsLoc!='SCM003'){
+		if(contentsLoc!='SCM002' && contentsLoc!='SCM003' && contentsLoc!='SMM011' && contentsLoc!='SBM012'){
 			if(contentsLoc!='SMM005'){
 				html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddTitlePopRow(this);">타이틀추가</button>';
 			}
@@ -472,6 +473,27 @@
 			html += '	</td>';
 			html += '</tr>';
 		}
+		if(contentsLoc=='SMM011' || contentsLoc=='SBM012'){
+			html += '<tr class="cateTypeTr">';
+			html += '	<th>플레이어</th>';
+			html += '	<td colspan="3">';
+			html += '		<label class="rdoBtn"><input type="radio" name="tvPlayer'+dataIdx+'" value="Y" checked="checked"/>YouTube</label>';
+			html += '		<label class="rdoBtn"><input type="radio" name="tvPlayer'+dataIdx+'" value="M" />MP4</label>';
+			html += '	</td>';
+			html += '</tr>';
+			html += '<tr class="cateTypeTr">';
+			html += '	<th>업로드<br>파일키</th>';
+			html += '	<td colspan="3">';
+			html += '		<td><input name="tvFileKey'+dataIdx+'" type="text" maxlength="200" data-valid-name="업로드 파일키" value=""/></td>';
+			html += '	</td>';
+			html += '</tr>';
+			html += '<tr class="cateTypeTr">';
+			html += '	<th>미디어<br>컨텐츠키</th>';
+			html += '	<td colspan="3">';
+			html += '		<td><input name="tvMediaKey'+dataIdx+'" type="text" maxlength="200" data-valid-name="미디어 컨텐츠키" value=""/></td>';
+			html += '	</td>';
+			html += '</tr>';
+		}
 		if(contentsLoc=='SGNB001'){
 			html += '<tr class="cateTypeTr">';
 			html += '	<th>유형선택</th>';

src/main/webapp/WEB-INF/views/display/MainListForm.html

@@ -776,6 +776,8 @@
 		if(val.split(',')[1]=='Y'){
 			if(val.split(',')[0]=='1711' || val.split(',')[0]=='1721'){
 				cate1No = '2100';
+			}if(val.split(',')[0]=='1713' || val.split(',')[0]=='1723'){
+				cate1No = '3000';
 			}else{
 				cate1No = val.split(',')[0];
 			}

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

@@ -87,9 +87,18 @@ var gagaSn = {
 			fontSizes: ['8','9','10','11','12','13','14','15','16','17','18','19','20','24','30','36'],
 			toolbar: toolbarOptions,
 			callbacks: {
-				onImageUpload: function(files, editor, welEditable) { //이미지 업로드
-					for (var i = files.length - 1; i >= 0; i--) {
-						sendFile(files[i], this);
+				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();
+						}
 					}
 				}
 			}
@@ -107,6 +116,32 @@ var gagaSn = {
 		} 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);
+			}
+		});
 	}
 
 }