Merge remote-tracking branch 'origin/develop' into xodud1202

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

@@ -1690,11 +1690,11 @@
 		FROM   TB_NOTICE A
 		WHERE  A.NOTICE_TYPE = 'G047_30'
 		<if test="stDate != null and stDate !=''">
-		AND A.NOTICE_EDDT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
+		AND A.NOTICE_EDDT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d)
 		</if>
 		<if test="edDate != null and edDate !=''">
 		<![CDATA[
-		AND A.NOTICE_STDT < DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
+		AND A.NOTICE_STDT <= DATE_FORMAT(#{edDate}, '%Y-%m-%d)
 		]]>
 		</if>
 		<if test='useYn != null and useYn !=""'>
@@ -2217,6 +2217,9 @@
 		                WHERE CATE_NO = B.CATE_NO
 		                AND GOODS_CD = A.GOODS_CD
 		                )
+		ON DUPLICATE KEY UPDATE
+		       REG_NO = #{regNo}
+		      ,REG_DT = NOW()
 	</insert>
 	
 	<!-- 상품 품목별 매핑 카테고리 저장 (LEAF CATE에만 상품 적용 )-->
@@ -2240,7 +2243,8 @@
 		              , IFNULL(B.DISP_ORD, 1)                AS DISP_ORD
 		              , A.SELF_GOODS_YN
 		         FROM TB_GOODS A
-		                  LEFT OUTER JOIN TB_GOODS_COMPOSE B ON A.GOODS_CD = B.GOODS_CD
+		         LEFT OUTER JOIN TB_GOODS_COMPOSE B ON A.GOODS_CD = B.GOODS_CD
+		                                            AND A.GOODS_TYPE = 'G056_D'
 		         WHERE A.GOODS_CD = #{goodsCd}
 		         ) Z
 		    INNER  JOIN TB_GOODS Y ON Z.COMPS_GOODS_CD = Y.GOODS_CD
@@ -2263,6 +2267,9 @@
 		                AND   BRAND_GROUP_NO = 0 
 		                AND GOODS_CD = A.GOODS_CD
 		                )
+		ON DUPLICATE KEY UPDATE
+		       REG_NO = #{regNo}
+		      ,REG_DT = NOW()
 	</insert>
 	
 	<!-- wms 상품 색상 , 사이즈별 재고 정보 조회 -->

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

@@ -437,7 +437,7 @@
 				var jsonData = JSON.stringify(removedData);
 
 				gagajf.ajaxJsonSubmit('/marketing/planning/corner/goods/delete', jsonData, function() {
-					fnCornerSearch();
+					fnConnerGoodsSearch();
 				});
 			}
 		});
@@ -514,7 +514,7 @@
 				sureBtnText: "확인",
 				sureBtnClick: function() {
 					var jsonData = JSON.stringify(oldGoodsList);
-					gagajf.ajaxJsonSubmit('/marketing/planning/corner/goods/save', jsonData, fnCornerSearch);
+					gagajf.ajaxJsonSubmit('/marketing/planning/corner/goods/save', jsonData, fnConnerGoodsSearch);
 				}
 			});
 		}

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

@@ -65,12 +65,12 @@
 											<table class="frmStyle">
 												<tr>
 													<th>리뷰 타이틀</th>
-													<td><input type="text" name="reTitle" class="w300 aR"/>
+													<td><input type="text" name="reTitle" class="w300 aL"/>
 													</td>
 												</tr>
 												<tr>
 													<th>전시순서</th>
-													<td><input type="text" name="reDispOrd" class="w100 aR" data-valid-type="numeric"></td>
+													<td><input type="text" name="reDispOrd" class="w100 aL" data-valid-type="numeric"></td>
 												</tr>
 											</table>
 											<div class="padding10">
@@ -111,12 +111,12 @@
 											<table class="frmStyle">
 												<tr>
 													<th>쿠폰 타이틀</th>
-													<td><input type="text" name="cuTitle" class="w300 aR">
+													<td><input type="text" name="cuTitle" class="w300 aL">
 													</td>
 												</tr>
 												<tr>
 													<th>전시순서</th>
-													<td><input type="text" name="cuDispOrd" class="w100 aR" data-valid-type="numeric"></td>
+													<td><input type="text" name="cuDispOrd" class="w100 aL" data-valid-type="numeric"></td>
 												</tr>
 												<tr>
 													<th>쿠폰 유의사항</th>
@@ -135,7 +135,7 @@
 																	<tr th:id="${'coupon'+num}">
 																		<th th:text="${'유의사항' + num}"></th>
 																		<td>
-																			<input type="text"	th:id="${'cpnNote' + (num-1)}" th:name="${'cpnNote' + (num-1)}" class="w300 aR">
+																			<input type="text"	th:id="${'cpnNote' + (num-1)}" th:name="${'cpnNote' + (num-1)}" class="w300 aL">
 																		</td>
 																	</tr>
 																</table>
@@ -194,7 +194,7 @@
 														<label th:id="${'file_' + num}" th:for="${'file' + num}" class="uFileLabel">파일선택</label>
 														<input type="hidden" name="fileItemVal"	th:id="${'fileItemVal' + num}" /> 
 														<input type="hidden" name="sysFileNms" th:id="${'sysFileNm' + num}" />
-														<input type="text" th:name="${'linkUrl' + num}" class="w300 aR">
+														<input type="text" th:name="${'linkUrl' + num}" class="w300 aL">
 													</div>
 													<br />
 													<table>
@@ -207,7 +207,7 @@
 														</tr>        
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" th:name="${'fileLinkUrl' + num}" class="w300 aR">
+															<td><input type="text" th:name="${'fileLinkUrl' + num}" class="w300 aL">
 															</td>
 														</tr>
 														</table>
@@ -216,7 +216,7 @@
 										</td>
 
 										<th>전시순서</th>
-										<td><input type="text" name="fileDispOrd" class="w100 aR" data-valid-type="numeric"></td>
+										<td><input type="text" name="fileDispOrd" class="w100 aL" data-valid-type="numeric"></td>
 									</tr>
 								</table>
 							</div>
@@ -257,7 +257,7 @@
 													<table>
 														<tr th:id="${'notice'+num}">
 															<th th:text="${'유의사항' + num}"></th>
-															<td><input type="text" th:id="${'noticeItemVal' + num}" th:name="${'noticeItemVal' + num}" class="w300 aR">
+															<td><input type="text" th:id="${'noticeItemVal' + num}" th:name="${'noticeItemVal' + num}" class="w300 aL">
 															</td>
 														</tr>
 													</table>
@@ -266,7 +266,7 @@
 										</td>
 
 										<th>전시순서</th>
-										<td><input type="text" name="noticeDispOrd" class="w100 aR" data-valid-type="numeric"></td>
+										<td><input type="text" name="noticeDispOrd" class="w100 aL" data-valid-type="numeric"></td>
 									</tr>
 								</table>
 							</div>
@@ -410,7 +410,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle1" class="w300 aR">
+															<td><input type="text" name="goodsTitle1" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -422,12 +422,12 @@
 														</tr>        
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl1" class="w300 aR">
+															<td><input type="text" name="goodsUrl1" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd1" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd1" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>
@@ -476,7 +476,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle2" class="w300 aR">
+															<td><input type="text" name="goodsTitle2" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -488,12 +488,12 @@
 														</tr>   
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl2" class="w300 aR">
+															<td><input type="text" name="goodsUrl2" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd2" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd2" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>
@@ -543,7 +543,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle3" class="w300 aR">
+															<td><input type="text" name="goodsTitle3" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -555,12 +555,12 @@
 														</tr>   
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl3" class="w300 aR">
+															<td><input type="text" name="goodsUrl3" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd3" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd3" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>
@@ -610,7 +610,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle4" class="w300 aR">
+															<td><input type="text" name="goodsTitle4" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -622,12 +622,12 @@
 														</tr>                                                                                                                       
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl4" class="w300 aR">
+															<td><input type="text" name="goodsUrl4" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd4" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd4" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>
@@ -677,7 +677,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle5" class="w300 aR">
+															<td><input type="text" name="goodsTitle5" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -689,12 +689,12 @@
 														</tr>   
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl5" class="w300 aR">
+															<td><input type="text" name="goodsUrl5" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd5" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd5" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>
@@ -744,7 +744,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle6" class="w300 aR">
+															<td><input type="text" name="goodsTitle6" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -756,12 +756,12 @@
 														</tr>   
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl6" class="w300 aR">
+															<td><input type="text" name="goodsUrl6" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd6" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd6" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>
@@ -811,7 +811,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle7" class="w300 aR">
+															<td><input type="text" name="goodsTitle7" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -823,12 +823,12 @@
 														</tr>   
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl7" class="w300 aR">
+															<td><input type="text" name="goodsUrl7" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd7" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd7" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>
@@ -878,7 +878,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle8" class="w300 aR">
+															<td><input type="text" name="goodsTitle8" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -890,12 +890,12 @@
 														</tr>   
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl8" class="w300 aR">
+															<td><input type="text" name="goodsUrl8" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd8" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd8" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>
@@ -945,7 +945,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle9" class="w300 aR">
+															<td><input type="text" name="goodsTitle9" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -957,12 +957,12 @@
 														</tr>   
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl9" class="w300 aR">
+															<td><input type="text" name="goodsUrl9" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd9" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd9" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>
@@ -1012,7 +1012,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle10" class="w300 aR">
+															<td><input type="text" name="goodsTitle10" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -1024,12 +1024,12 @@
 														</tr>   
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl10" class="w300 aR">
+															<td><input type="text" name="goodsUrl10" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd10" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd10" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>

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

@@ -8,11 +8,11 @@
 
     var gAuthkey = '';
     if (location.host.indexOf("ld") > -1) {
-    	gAuthkey = "PMW65Dgn2LQ6/YyYHJJsrHHLJyX+UndGTiJsAHrw6Wwo8n30YXfDQTTp9j91uc+f2I9Zy9UVYQS6cYnlo41Olo2aK80HoG7c8SC9S5ecnFfnUBj0g45T2jZiKiUf/+crqNgixpI4zxSFHBX1y1dPS8iEj24qDRFvtaP2mtHZYg8= ";
+    	gAuthkey = "PMW65Dgn2LQ6/YyYHJJsrHHLJyX+UndGTiJsAHrw6Wwo8n30YXfDQTTp9j91uc+f2I9Zy9UVYQS6cYnlo41Olo2aK80HoG7c8SC9S5ecnFfnUBj0g45T2jZiKiUf/+crqNgixpI4zxSFHBX1y1dPS8iEj24qDRFvtaP2mtHZYg8=";
     } else if (location.host.indexOf("lp") > -1) {
     	gAuthkey = "hr0AqviRLOCsbiIneYWPXdkhMn8awpDYw6HPDAvYo/cKKYVOyyuonGO2qFLlmur6svsAV6tkMZY5N1Iygq42R74h7AFlzk8xhM9YzIP8ySVhEN2LFlRxgsm/GQyLrzNoS1BwcHSYyOvAfzBCAVu6f8ubLw68bOFWivcvJKAz91I=";
     } else if (location.host.indexOf("td") > -1) {
-    	gAuthkey = "Jykwjt2KOmAKAQf8eTuiYAej+o7AMW4L9ToeLPSbJ6MXA7OLcpvFwixUjmbdQiSL/CwNKvJa6yXaIXMIDMD5oRK/LMD3/YU1A9oLJK2Pbdm7qYLQYOEH46i+riwBsz2O8HaM1f/pKcfhLDtfuTXBPerPQDxmWwjuUPkUBF0JUrE= ";
+    	gAuthkey = "NCjaCDsy/BnAZkgEmex+vktPPKA/n6yP9XMdcTKj/JBY9eGe9D0BjxL7J+j+qkaEMqupJBvZynS22LOjmzjHlmiqKpZzCG3CIScTecDa2uxY2UUq11ISj1ghxmllHmurrgu1G01POd5OFli7bbQsZL6iQR+6QabmzWv9rlWfuwk=";
     } else if (location.host.indexOf("dev") > -1) {
     	gAuthkey = "hr0AqviRLOCsbiIneYWPXdkhMn8awpDYw6HPDAvYo/cKKYVOyyuonGO2qFLlmur6svsAV6tkMZY5N1Iygq42R74h7AFlzk8xhM9YzIP8ySVhEN2LFlRxgsm/GQyLrzNoS1BwcHSYyOvAfzBCAVu6f8ubLw68bOFWivcvJKAz91I=";
     } else if (location.host.indexOf("qas") > -1) {