Merge branch 'sowon' into develop

src/main/java/com/style24/persistence/domain/Plan.java

@@ -247,6 +247,8 @@ public class Plan extends TscBaseDomain{
 		private String benefit;				// 혜택구분
 		private int pntAmt;				//포인트
 		private Integer cpnId;				//쿠폰아이디
+		private int pntUsableDay;		//포인트사용가능일
+		
 		
 		// Pagination
 		private TscPageRequest pageable;

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

@@ -1253,6 +1253,7 @@
 		      , BAS_DAYS
 		      , BENEFIT_GB
 		      , PNT_AMT
+		      , PNT_USABLE_DAY
 		      , CPN_ID
 		      , REG_NO
 		      , REG_DT
@@ -1264,6 +1265,7 @@
 		      , #{basDays}
 		      , #{benefitGb}
 		      , #{pntAmt}
+		      , #{pntUsableDay}
 		      , #{cpnId}
 		      , #{regNo}
 		      , CURRENT_TIMESTAMP
@@ -1274,6 +1276,7 @@
 		UPDATE
 		  BENEFIT_GB = #{benefitGb}  
 		, PNT_AMT    = #{pntAmt}
+		, PNT_USABLE_DAY  = #{pntUsableDay}
 		, CPN_ID     = #{cpnId}
 		, UPD_DT     = now()                                             
 		, UPD_NO     = #{updNo}      
@@ -1287,6 +1290,7 @@
 		      ,PA.BENEFIT_GB 
 		      ,PA.CPN_ID 
 		      ,PA.PNT_AMT 
+		      ,PA.PNT_USABLE_DAY
 		      ,(CASE PA.BENEFIT_GB WHEN 'P' THEN '포인트' 
                            WHEN 'C' THEN '쿠폰'
                            ELSE '포인트/쿠폰' END) AS BENEFIT
@@ -1310,6 +1314,7 @@
 		      , BAS_DAYS
 		      , BENEFIT_GB
 		      , PNT_AMT
+		      , PNT_USABLE_DAY
 		      , CPN_ID
 		      , REG_NO
 		      , REG_DT
@@ -1320,7 +1325,8 @@
 		       #{planSq}
 		      , BAS_DAYS  
 		      , BENEFIT_GB
-		      , PNT_AMT   
+		      , PNT_AMT
+		      , PNT_USABLE_DAY  
 		      , CPN_ID    
 		      , #{regNo}
 		      , CURRENT_TIMESTAMP

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

@@ -14,7 +14,7 @@
  * 1.0  2020.02.04   sowon   최초 작성
  *******************************************************************************
  -->
-<div class="modalPopup" data-width="1280" id="planRegisterFormDiv">
+<div class="modalPopup" data-width="1395" id="planRegisterFormDiv">
 	<div class="panelStyle">
 		<div class="panelTitle">
 			<h2 th:text="${'기획전 ' + (mode == 'N' ? '등록' : '수정')}"></h2>
@@ -179,7 +179,7 @@
 						<th>PC 메인 이미지<i id="pMimgStar"></i><br/>[삭제여부<label class="chkBox"><input type="checkbox" name="orgMainPimgDelYn" value="Y"/></label>]</th>
 						<td>
 							<div th:if=*{mainPimg} id="mainPimgView" style="float:left;">
-								<img id="PreMainPimgUrl" th:src="${@environment.getProperty('upload.image.view')} + *{mainPimg}" style="max-width:720px;"/>
+								<img id="PreMainPimgUrl" th:src="${@environment.getProperty('upload.image.view')} + *{mainPimg}" style="max-width:470px;"/>
 							</div>
 						</td>
 						<td colspan="4">
@@ -195,7 +195,7 @@
 						<th>모바일 메인 이미지<i id="mMimgStar"></i><br/>[삭제여부<label class="chkBox"><input type="checkbox" name="orgMainMimgDelYn" value="Y"/></label>]</th>
 						<td>
 							<div th:if=*{mainMimg} id="imgFileView" style="float:left;">
-								<img id="PreMainMimgUrl" th:src="${@environment.getProperty('upload.image.view')} + *{mainMimg}" style="max-width:720px;"/>
+								<img id="PreMainMimgUrl" th:src="${@environment.getProperty('upload.image.view')} + *{mainMimg}" style="max-width:470px;"/>
 							</div>
 						</td>
 						<td colspan="4">
@@ -1596,7 +1596,7 @@
 				}else{false;}
 	    	}
 	    },
-		{headerName: "쿠폰아이디", field: "cpnId", width: 100, cellClass: 'text-center', cellEditor: 'numericCellEditor'
+		{headerName: "쿠폰ID", field: "cpnId", width: 80, cellClass: 'text-center', cellEditor: 'numericCellEditor'
 			,cellEditorParams: { maxlength: 3, required: true }
     	    , editable: function(params) { 
 	    		if (params.data.benefit == '쿠폰' || params.data.benefit == '포인트/쿠폰') {
@@ -1604,6 +1604,14 @@
 				}else{false;}
     		}
     	},
+    	{headerName: "포인트적용일", field: "pntUsableDay", width: 100, cellClass: 'text-center', cellEditor: 'numericCellEditor'
+			,cellEditorParams: { maxlength: 3, required: true }
+    	    , editable: function(params) { 
+	    		if (params.data.benefit == '포인트' || params.data.benefit == '포인트/쿠폰') {
+					return true;
+				}else{false;}
+    		}
+    	},
 	];