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

src/main/java/com/style24/admin/biz/web/TsaGoodsController.java

@@ -1806,7 +1806,7 @@ public class TsaGoodsController extends TsaBaseController {
 		cellName = new String[2];
 		cellName[0] = "goodsCd";
 		cellName[1] = "kmcKey";
-		String targetPath = GagaFileUtil.getConcatenationPath(env.getProperty("upload.default.target.path"), "excel");
+		String targetPath = GagaFileUtil.getConcatenationPath(env.getProperty("upload.excel.target.path"), "excel");
 		Collection<GagaMap> dataList = GagaExcelUtil.getList(GagaFileUtil.getConcatenationPath(targetPath, goodsVideo.getExcelFileNm()), 0, cellName);
 
 		int cnt = goodsService.saveExcelGoodsVideo(dataList);

src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -267,23 +267,28 @@ public class TsaOrderChangeController extends TsaBaseController {
 		int ordChgSq = result.getInt("ordChgSq");
 
 		if (ordChgSq > 0) {
-			try {
-				Payment payment = new Payment();
-				payment.setOrdNo(cnclReq.getOrdNo());
-				payment = coreOrderChangeService.getPaymentInfo(payment);
-				// 네이버페이 주문형 데이터는 알림톡, 메일 송부X
-				if(TscConstants.PgGb.NAVER_ORDER.value().equals(payment.getPgGb())) {
-					return super.ok("성공");
-				}
+			Payment payment = new Payment();
+			payment.setOrdNo(cnclReq.getOrdNo());
+			payment = coreOrderChangeService.getPaymentInfo(payment);
+
+			// 네이버페이 주문형 데이터는 알림톡, 메일 송부X
+			if(TscConstants.PgGb.NAVER_ORDER.value().equals(payment.getPgGb())) {
+				return super.ok("성공");
+			}
 
-				// 취소 알림톡 관련 정보 조회
-				OrderChange orderChange = coreOrderChangeService.getKakaoOrderCancelInfo(ordChgSq);
+			// 취소 알림톡 관련 정보 조회
+			OrderChange orderChange = coreOrderChangeService.getKakaoOrderCancelInfo(ordChgSq);
 
+			try {
 				// 취소 알림톡 발송
 				if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
 					coreKakaotalkService.sendOrderCancelComplete(orderChange, userNo);
 				}
-
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			
+			try {
 				// 취소 안내 메일 정보 조회
 				GagaMap replaceInfo = coreOrderChangeService.getMailOrderCancelReplaceInfo(orderChange);
 
@@ -292,7 +297,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 					coreMailService.sendOrderCancel(replaceInfo, userNo);
 				}
 			} catch (Exception e) {
-				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+				e.printStackTrace();
 			}
 		}
 
@@ -505,15 +510,19 @@ public class TsaOrderChangeController extends TsaBaseController {
 		int ordChgSq = result.getInt("ordChgSq");
 
 		if (ordChgSq > 0) {
+			// 반품 알림톡 관련 정보 조회
+			OrderChange orderChange = coreOrderChangeService.getKakaoOrderReturnInfo(ordChgSq);
+
 			try {
-				// 반품 알림톡 관련 정보 조회
-				OrderChange orderChange = coreOrderChangeService.getKakaoOrderReturnInfo(ordChgSq);
-				
 				// 반품 알림톡 발송
 				if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
 					coreKakaotalkService.sendOrderReturnRequest(orderChange, userNo);
 				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 
+			try {
 				// 반품 안내 메일 정보 조회
 				GagaMap replaceInfo = coreOrderChangeService.getMailOrderReturnReplaceInfo(orderChange);
 
@@ -522,7 +531,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 					coreMailService.sendOrderReturn(replaceInfo, userNo);
 				}
 			} catch (Exception e) {
-				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+				e.printStackTrace();
 			}
 		}
 		
@@ -798,15 +807,19 @@ public class TsaOrderChangeController extends TsaBaseController {
 		int ordChgSq = result.getInt("ordChgSq");
 
 		if (ordChgSq > 0) {
-			try {
-				// 교환 알림톡 관련 정보 조회
-				OrderChange orderChange = coreOrderChangeService.getKakaoOrderReturnInfo(ordChgSq);
+			// 교환 알림톡 관련 정보 조회
+			OrderChange orderChange = coreOrderChangeService.getKakaoOrderReturnInfo(ordChgSq);
 
+			try {
 				// 교환 알림톡 발송
 				if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
 					coreKakaotalkService.sendOrderExchangeRequest(orderChange, userNo);
 				}
-
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			
+			try {
 				// 교환 안내 메일 정보 조회
 				GagaMap replaceInfo = coreOrderChangeService.getMailOrderExchangeReplaceInfo(orderChange);
 
@@ -815,7 +828,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 					coreMailService.sendOrderExchange(replaceInfo, userNo);
 				}
 			} catch (Exception e) {
-				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+				e.printStackTrace();
 			}
 		}
 

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

@@ -68,7 +68,7 @@
 					<tr>
 						<th>공지제목</th>
 						<td>
-							<input name="noteicTitle" type="text" maxlength="200"/>
+							<input name="noticeTitle" type="text" maxlength="200"/>
 						</td>
 						<th>사용여부</th>
 						<td>
@@ -405,22 +405,21 @@
 			return;
 		}
 		
-		var removedData = gagaAgGrid.removeRowData(gridNoticeGoodsOptions, false);
-		
 		// 신규 상세 공지일경우 화면에서만 삭제
 		if (gagajf.isNull($('#goodsNoticeForm input[name=noticeSq]').val())){
 			return;
 		}
 		
-		var arrGoodsCd = [];
-		$.each(selectedData, function(idx, item) {
-			arrGoodsCd.push(item.goodsCd);
-		});
-		
 		mcxDialog.confirm('삭제하시겠습니까?',  {
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
 			sureBtnClick: function(){
+				var removedData = gagaAgGrid.removeRowData(gridNoticeGoodsOptions, false);
+				var arrGoodsCd = [];
+				$.each(selectedData, function(idx, item) {
+					arrGoodsCd.push(item.goodsCd);
+				});
+				
 				var data = {arrGoodsCd : arrGoodsCd
 							,noticeSq : $('#goodsNoticeForm input[name=noticeSq]').val()
 			};

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

@@ -375,7 +375,7 @@
 	});
 	
 	var fnGoodsResSellDeleteCallBack = function(){
-		//fnGoodsResSellRegistListSearch($("#goodsResSellListForm input[name=searchGb]").val());
+		fnGoodsResSellRegistListSearch($("#goodsResSellListForm input[name=searchGb]").val());
 	}
 	
 	$(document).ready(function() {

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

@@ -167,7 +167,7 @@
 		}
 
 		if (fromDate > toDate) {
-			mcxDialog.alertC("예약 시작일자는 종료일자 보다 클 수 없습니다.", {
+			mcxDialog.alertC("예약 종료일시는 시작료일시 보다 작을 수 없습니다.", {
 				sureBtnText: "확인",
 				sureBtnClick: function() {
 					$('#goodsRsvtTnmForm input[name=applyEdYMD]').focus();

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

@@ -296,6 +296,10 @@
 		// Create a summernote
 		var snOptions = gagaSn.getToolbarOptions('media');
 		gagaSn.createSummernote(snOptions, '#note');
+		
+		var date = new Date();
+		$('#cardInterestForm  input[name=prmtStd]').val(date.format("YYYY-MM-DD"));
+		$('#cardInterestForm  input[name=prmtEdd]').val(date.format("YYYY-MM-DD"));
 	});
 
 /*]]>*/

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

@@ -40,7 +40,7 @@
 					</tr>
 					<tr>
 						<th>행사기간<em class="required" title="필수"></em></th>
-						<td >
+						<td id="sellTermsP">
 							<input name="prmtStd" id="prmtStd" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="행사시작일" th:value="${cardPrmt.prmtStd}"/>
 							~
 							<input name="prmtEdd" id="prmtEdd" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="행사종료일" th:value="${cardPrmt.prmtEdd}"/>
@@ -319,7 +319,10 @@
 	}
 
 	$(document).ready(function() {
-
+		//gagajf.setDate('#sellTermsP','prmtStd', 'prmtEdd', 't');
+		var date = new Date();
+		$('#cardPromotionForm  input[name=prmtStd]').val(date.format("YYYY-MM-DD"));
+		$('#cardPromotionForm  input[name=prmtEdd]').val(date.format("YYYY-MM-DD"));
 	});
 
 /*]]>*/