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

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

@@ -216,8 +216,7 @@
 
 	// 미리보기
 	var fnPreview = function(planSq) {
-		var _wmall = [[${@environment.getProperty('domain.pastel')}]];
-		window.open(_wmall + '/planning/detail/form?planSq=' + planSq + '&adminPreview=Y', '_blank');
+		window.open(_frontUrl + '/planning/detail/form?planSq=' + planSq + '&adminPreview=Y', '_blank');
  		//document.location.href = _PAGE_CUSTOMER_INFO;
 	}
 

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

@@ -189,8 +189,8 @@
 	
 	// 미리보기
 	var fnPreview = function(planSq) {
-		var _wmall = [[${@environment.getProperty('domain.pastel')}]];
-		window.open(_wmall + '/planning/detail/form?planSq=' + planSq + '&adminPreview=Y', '_blank');
+		//var _wmall = [[${@environment.getProperty('domain.front')}]];
+		window.open(_frontUrl + '/planning/detail/form?planSq=' + planSq + '&adminPreview=Y', '_blank');
  		//document.location.href = _PAGE_CUSTOMER_INFO;
 	}