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

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

@@ -395,15 +395,8 @@
 		               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.PNT_UPLOAD_STAT IN ('G070_10')                 -- 반영예정
 		               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/display/MainContentsPopupForm.html

@@ -93,9 +93,9 @@
 			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' && contentsLoc!='SMM011' && contentsLoc!='SBM012'){
+			if(contentsLoc!='SCM002' && contentsLoc!='SCM003'){
 				html += '<td class="aL">';
-				if(contentsLoc!='SMM005'){
+				if(contentsLoc!='SMM005'  && contentsLoc!='SMM011' && contentsLoc!='SBM012'){
 					html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddTitlePopRow(this);">타이틀추가</button>';
 				}
 				if(contentsLoc=='SMM001' || contentsLoc=='SMM002' || contentsLoc=='SBM004' || contentsLoc=='SBMM004' || contentsLoc=='SCM001'){
@@ -104,10 +104,12 @@
 				if(contentsLoc=='SBM005' || contentsLoc=='SBMM005'){
 					html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddBrandDescRow(this);">브랜드소개추가</button>';
 				}
-				if(contentsLoc!='SMM005' && contentsLoc!='SBM005' && contentsLoc!='SBMM005' && contentsLoc!='SGNB001'){
+				if(contentsLoc!='SMM005' && contentsLoc!='SBM005' && contentsLoc!='SBMM005' && contentsLoc!='SGNB001'  && contentsLoc!='SMM011' && contentsLoc!='SBM012'){
 					html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddImgPopRow(this);">이미지추가</button>';
 				}
-				html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddLinkPopRow(this);">링크추가</button>';
+				if(contentsLoc!='SMM011' && contentsLoc!='SBM012'){
+					html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddLinkPopRow(this);">링크추가</button>';
+				}
 				html += '<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteContentsRow(this);">삭제</button></td>';
 			}
 			html += '</tr>';
@@ -125,6 +127,39 @@
 				html += '	</td>';
 				html += '</tr>';
 			}
+			if(contentsLoc=='SMM011' || contentsLoc=='SBM012'){
+				html += '<tr class="cateTypeTr">';
+				html += '	<th>동영상구분</th>';
+				html += '	<td colspan="3">';
+				if(result[i].strVar1=='Y'){
+					html += '		<label class="rdoBtn"><input type="radio" name="tvPlayer'+i+'" value="Y" onclick="fnChangeTvPlayer(this,'+i+');" checked="checked" />YouTube</label>';
+					html += '		<label class="rdoBtn"><input type="radio" name="tvPlayer'+i+'" value="M" onclick="fnChangeTvPlayer(this,'+i+');"/>MP4</label>';
+				}else{
+					html += '		<label class="rdoBtn"><input type="radio" name="tvPlayer'+i+'" value="Y" onclick="fnChangeTvPlayer(this,'+i+');" />YouTube</label>';
+					html += '		<label class="rdoBtn"><input type="radio" name="tvPlayer'+i+'" value="M" onclick="fnChangeTvPlayer(this,'+i+');" checked="checked" />MP4</label>';
+				}
+				html += '	</td>';
+				html += '</tr>';
+				html += '<tr class="cateTypeTr" name="tvY'+i+'">';
+				html += '	<th>미디어<br>컨텐츠키</th>';
+				html += '	<td colspan="3">';
+				html += '		<input name="tvMediaKey'+i+'" type="text" class="w150" maxlength="200" data-valid-name="미디어 컨텐츠키" value="'+result[i].strVar2+'"/>';
+				html += '	</td>';
+				html += '</tr>';
+				if(result[i].strVar1=='M'){
+					html += '<tr class="cateTypeTr" name="tvM'+i+'">';
+					html +='	<th>파일첨부<em className="required" title="필수"></em></th>';
+					html +='	<td className="infoTxt" colSpan="5">';
+					html +='		<div className="uFile w300">';
+					html +='			<input id="file'+i+'" name="file" type="file" className="uFileInput w300" onchange="fnVideoFileUpload(this, '+i+')"/>';
+					html +='			<label htmlFor="file'+i+'" className="uFileLabel">파일선택</label>';
+					html +='			<input type="hidden" name="kufKey" value="'+result[i].strVar3+'"/>';
+					html +='			<input type="hidden" name="kmcKey"/>';
+					html +='		</div>';
+					html +='	</td>';
+					html += '</tr>';
+				}
+			}
 			if(contentsLoc=='SGNB001'){
 				html += '<tr class="cateTypeTr">';
 				html += '	<th>유형선택</th>';
@@ -330,7 +365,7 @@
 				html += '	</tr>';
 			}
 			html += '</thead><tbody>';
-			if(contentsLoc!='SCM002' && contentsLoc!='SCM003'){
+			if(contentsLoc!='SCM002' && contentsLoc!='SCM003' && contentsLoc!='SMM011' && contentsLoc!='SBM012'){
 				for(var j=1; j<5; j++){
 					var strTitle = eval("result["+i+"].strTitle" + j);
 					var imgPath = eval("result["+i+"].imgPath" + j);
@@ -367,6 +402,18 @@
 		tableLen = $(".mcTable").length;
 	}
 
+	var fnChangeTvPlayer = function (obj,idx){
+		let tvPlayer = $("#mcTable"+idx).find("input:radio[name=tvPlayer"+idx+"]:checked").val();
+
+		if(tvPlayer == 'Y'){
+			$(obj).closest("table").find("[name=tvY"+idx+"]").show();
+			$(obj).closest("table").find("[name=tvM"+idx+"]").hide();
+		}else{
+			$(obj).closest("table").find("[name=tvY"+idx+"]").show();
+			$(obj).closest("table").find("[name=tvM"+idx+"]").show();
+		}
+	}
+
 	var fnChangeGnbCateType = function (obj, idx){
 		let cateType = $("#mcTable"+idx).find("input:radio[name=cateType"+idx+"]:checked").val();
 
@@ -475,24 +522,29 @@
 		}
 		if(contentsLoc=='SMM011' || contentsLoc=='SBM012'){
 			html += '<tr class="cateTypeTr">';
-			html += '	<th>플레이어</th>';
+			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 += '		<label class="rdoBtn"><input type="radio" name="tvPlayer'+dataIdx+'" value="Y" onclick="fnChangeTvPlayer(this,'+dataIdx+');" checked="checked" />YouTube</label>';
+			html += '		<label class="rdoBtn"><input type="radio" name="tvPlayer'+dataIdx+'" value="M" onclick="fnChangeTvPlayer(this,'+dataIdx+');"/>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 += '<tr class="cateTypeTr" name="tvY'+dataIdx+'">';
 			html += '	<th>미디어<br>컨텐츠키</th>';
 			html += '	<td colspan="3">';
-			html += '		<td><input name="tvMediaKey'+dataIdx+'" type="text" maxlength="200" data-valid-name="미디어 컨텐츠키" value=""/></td>';
+			html += '		<input name="tvMediaKey'+dataIdx+'" type="text" class="w150" maxlength="200" data-valid-name="미디어 컨텐츠키" value=""/>';
 			html += '	</td>';
 			html += '</tr>';
+			html += '<tr class="cateTypeTr" name="tvM'+dataIdx+'" style="display: none;">';
+			html +='	<th>파일첨부<em className="required" title="필수"></em></th>';
+			html +='	<td className="infoTxt" colSpan="5">';
+			html +='		<div className="uFile w300">';
+			html +='			<input id="file'+dataIdx+'" name="file" type="file" className="uFileInput w300" onchange="fnVideoFileUpload(this, '+dataIdx+')"/>';
+			html +='			<label htmlFor="file'+dataIdx+'" className="uFileLabel">파일선택</label>';
+			html +='			<input type="hidden" name="kufKey"/>';
+			html +='			<input type="hidden" name="kmcKey"/>';
+			html +='		</div>';
+			html +='	</td>';
+			html += '</tr>';
 		}
 		if(contentsLoc=='SGNB001'){
 			html += '<tr class="cateTypeTr">';
@@ -625,6 +677,11 @@
 		tableLen = tableLen+1;
 	});
 
+	var fnVideoFileUpload = function (obj, idx){
+		var file = obj.files[0];
+		gagaKollus.upload('Display', file, $(obj).find('input[name=kufKey]'));
+	}
+
 	var fnChangeBannerType = function (obj, idx){
 		if(idx==1){
 			$(obj).closest("table").find("[id=bannerImgTr1]").show();
@@ -792,6 +849,13 @@
 				i++;
 			});
 
+			if(contentsLoc=='SMM011'){
+				var thisIdx = $(this).find("input[name=tableIdx]").val();
+				strVar1 = $(this).find("input:radio[name=tvPlayer"+thisIdx+"]:checked").val();
+				strVar2 = $(this).find("input[name=tvMediaKey"+thisIdx+"]").val();
+				strVar3 = $(this).find("input[name=kufKey]").val();
+			}
+
 			var dispStdt = $(this).find("[name=dispStdt]").val().replace(/[^0-9]/g, '') + "" +$(this).find("[name=stTimeHour]").val().replace('시', '') + "" +$(this).find("[name=stTimeMin]").val().replace('분', '') + "00";
 			var dispEddt = $(this).find("[name=dispEddt]").val().replace(/[^0-9]/g, '') + "" +$(this).find("[name=edTimeHour]").val().replace('시', '') + "" +$(this).find("[name=edTimeMin]").val().replace('분', '') + "59";
 
@@ -1120,6 +1184,12 @@
 		return html;
 	}
 
+	// 동영상파일 선택 시
+	$('#popSortable input[name=file]').on('change', function() {
+		var file = this.files[0];
+		gagaKollus.upload('Display', file, $('input[name=kufKey]'));
+	});
+
 	// 창닫기
 	var fnMainContentsPopupFormClose = function (){
 		uifnPopupClose('popupMainContents');