Merge branch 'develop' into jsshin

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

@@ -162,7 +162,6 @@
 		        , M.POLL_QVAL9                                                                                                 
 		        , M.POLL_QVAL10    
 		        , M.POLL_QTYPE_NM
-		        , M.PLAN_SQ
 		 FROM
 		 (		      
 		   SELECT A.POLL_SQ
@@ -188,9 +187,7 @@
 		        , B.POLL_QVAL9
 		        , B.POLL_QVAL10
 		        , B.POLL_QTYPE
-		        , P.PLAN_SQ
 		  FROM   TB_POLL A LEFT JOIN TB_POLL_QUESTION B ON A.POLL_SQ = B.POLL_SQ 
-		                   LEFT JOIN TB_PLAN P ON A.POLL_SQ = P.POLL_SQ
 		  WHERE 1=1
 		     AND A.DEL_YN = 'N'
 		     AND B.DEL_YN = 'N'
@@ -227,7 +224,6 @@
 	              , B.POLL_QVAL8
 	              , B.POLL_QVAL9
 	              , B.POLL_QVAL10
-	              , P.PLAN_SQ
          )M
          ORDER BY M.REG_DT DESC
 	

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

@@ -118,7 +118,7 @@
 				html += '<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteContentsRow(this);">삭제</button></td>';
 			}
 			html += '</tr>';
-			if(contentsLoc=='SBM004' || contentsLoc=='SBM005'){
+			if(contentsLoc=='SBM004' || contentsLoc=='SBM005' || contentsLoc=='SBMM004'){
 				html += '<tr class="cateTypeTr">';
 				html += '	<th>클릭시<br>페이지창</th>';
 				html += '	<td colspan="3">';
@@ -567,7 +567,7 @@
 		}
 		html += '<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteContentsRow(this);">삭제</button></td>';
 		html += '</tr>';
-		if(contentsLoc=='SBM004' || contentsLoc=='SBM005'){
+		if(contentsLoc=='SBM004' || contentsLoc=='SBM005' || contentsLoc=='SBMM004'){
 			html += '<tr class="cateTypeTr">';
 			html += '	<th>클릭시<br>페이지창</th>';
 			html += '	<td colspan="3">';
@@ -936,7 +936,7 @@
 
 			var dispOrd = $(this).find("[name=dispOrd]").val();
 
-			if(contentsLoc=='SBM004' || contentsLoc=='SBM005'){
+			if(contentsLoc=='SBM004' || contentsLoc=='SBM005' || contentsLoc=='SBMM004'){
 				var thisIdx = $(this).find("input[name=tableIdx]").val();
 				contentsType = $(this).find("input:radio[name=pageTarget"+thisIdx+"]:checked").val();
 			}

src/main/webapp/WEB-INF/views/goods/GoodsDetailForm.html

@@ -2382,7 +2382,7 @@
 		}
 		
 		// 인증대상이 아니면 스킵
-		if ("G083_1" != $("#goodsDetailForm  input[name=certTargetGb]").val()){
+		if ("G083_1" != $("#goodsDetailForm input[name=selCertTargetGb]:checked").val()){
 			return true;
 		}
 		

src/main/webapp/WEB-INF/views/marketing/PlanDetailPopupForm.html

@@ -1723,6 +1723,16 @@
 				$("#attendTd").css('display','none');
 			}
 			 
+			 if (planInfo.planGb =='E') {
+				 $("#pollTr").show();
+				
+			}else{
+				 $("#pollTr").hide();
+			}
+			 
+			 
+			
+			 
 			 
 			gridOptionsFGBrandList.api.setRowData(planBrandList);
 			gridOptionsFGCateList.api.setRowData(planCateList);

src/main/webapp/WEB-INF/views/order/OrderDetailForm.html

@@ -213,7 +213,8 @@ var columnDefsGoodsInfo = [
 					return '<a href="javascript:void(0);" onclick="cfnOpenFrontGoodsPopup(\'' + params.data.itemCd + '\',\'' + params.data.siteCd + '\');">' + params.value + '</a>';
 				}
 			},
-			{headerName: "옵션1"		, field: "optCd1"		, width: 80, cellClass: 'text-center'},
+			//{headerName: "옵션1"		, field: "optCd1"		, width: 80, cellClass: 'text-center'},
+			{headerName: "옵션1"		, field: "colorNm"		, width: 80, cellClass: 'text-center'},
 			{headerName: "옵션2"		, field: "optCd2"		, width: 80, cellClass: 'text-center'},
 			{headerName: "단품수량"	, field: "itemQty"		, width: 80, cellClass: 'text-center'},
 			{
@@ -668,7 +669,8 @@ var columnDefsOrderChangeInfo = [
 	/*{headerName: "요청구분"		, field: "chgGbNm"		, width: 100	, cellClass: 'text-center'},*/
 	{headerName: "요청상태"		, field: "chgStatNm"	, width: 100	, cellClass: 'text-center'},
 	{headerName: "상품코드"		, field: "goodsCd"		, width: 100	, cellClass: 'text-center'},
-	{headerName: "옵션1"			, field: "optCd1"		, width: 100	, cellClass: 'text-center'},
+	//{headerName: "옵션1"			, field: "optCd1"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "옵션1"			, field: "colorNm"		, width: 100	, cellClass: 'text-center'},
 	{headerName: "옵션2"			, field: "optCd2"		, width: 100	, cellClass: 'text-center'},
 	{headerName: "수량"			, field: "chgQty"		, width: 100	, cellClass: 'text-center'},
 	/*{headerName: "요청상태"		, field: "chgStatNm"	, width: 100	, cellClass: 'text-center'},*/

src/main/webapp/WEB-INF/views/order/OrderListForm.html

@@ -429,7 +429,8 @@ var columnDefsOrderList = [
 					}
 				}
 			},
-			{headerName: "옵션1"		, field: "optCd1"		, width: 60	, cellClass: 'text-center'	, sortable: true},
+			//{headerName: "옵션1"		, field: "optCd1"		, width: 60	, cellClass: 'text-center'	, sortable: true},
+			{headerName: "옵션1"		, field: "colorNm"		, width: 60		, cellClass: 'text-center'	, sortable: true},
 			{headerName: "옵션2"		, field: "optCd2"		, width: 60		, cellClass: 'text-center'	, sortable: true},
 			{headerName: "단품명"		, field: "itemNm"		, width: 200	, cellClass: 'text-left'	, sortable: true},
 			{

src/main/webapp/dx5/dextuploadx5-configuration.js

@@ -18,7 +18,7 @@
     } else if (location.host.indexOf("qas") > -1) {
     	gAuthkey = "gx9EHEhXzTpbdxWjty/oHh9cfVi5WA5X4BV71AHaC/ORN/1fcs8nTTd4oUUvC5WhHqEa6Wt8cfmCBJ9w/pJpRhDd+tVu6kPDt9bxZL9n0bvaUn2rrbmJMA+HC9gzahwdEOcjr6ZOmNSEd6N0xN2BDBk55hvfPw02R77XjVuZrQU=";
     } else {
-    	gAuthkey = "YOUQYUILPZSEXURW";
+    	gAuthkey = "DUAYCUDVOFWITARW";
     }
 
     win.dextuploadx5Configuration = {

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

@@ -126,7 +126,7 @@ var gagaSn = {
 		$.ajax({
 			data : formData,
 			type : 'POST',
-			url : '/common/file/upload?subDir=/Upload/editor',
+			url : '/common/file/upload?subDir=/editor',
 			cache : false,
 			contentType : false,
 			enctype : 'multipart/form-data',