Merge branch 'ST24PRJ-618' into develop

src/main/java/com/style24/admin/biz/dao/TsaMailTemplateDao.java

@@ -101,7 +101,7 @@ public interface TsaMailTemplateDao {
 	 * @author gagamel
 	 * @since 2021. 5. 11
 	 */
-	void deleteMailTemplate(MailTemplate mailTemplate);
+	int deleteMailTemplate(MailTemplate mailTemplate);
 
 	/**
 	 * 메일템플릿코너 삭제

src/main/java/com/style24/admin/biz/service/TsaMailTemplateService.java

@@ -182,6 +182,25 @@ public class TsaMailTemplateService {
 		}
 	}
 
+	/**
+	 * 메일템플릿 삭제
+	 * 
+	 * @param Integer
+	 * @return int
+	 * @author card007
+	 * @since 2021. 12. 16
+	 */
+	@Transactional("shopTxnManager")
+	public int deleteMailTemplate(Integer mailtSq) {
+		MailTemplate mailTemplate = new MailTemplate();
+		mailTemplate.setMailtSq(mailtSq);
+		mailTemplate.setUseYn("N");
+		mailTemplate.setRegNo(TsaSession.getInfo().getUserNo());
+		mailTemplate.setUpdNo(TsaSession.getInfo().getUserNo());
+
+		return mailTemplateDao.deleteMailTemplate(mailTemplate);
+	}
+
 	/**
 	 * 메일템플릿코너 삭제
 	 * @param mailtcSq - 메일템플릿코너일련번호

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

@@ -1728,6 +1728,27 @@ public class TsaMarketingController extends TsaBaseController {
 		return super.ok(message.getMessage("SUCC_0003"));
 	}
 
+	/**
+	 * 메일템플릿 삭제
+	 * 
+	 * @param Integer
+	 * @return GagaResponse
+	 * @author card007
+	 * @since 2021. 12. 16
+	 */
+	@PostMapping("/mailtemplate/delete/{mailtSq}")
+	@ResponseBody
+	public GagaResponse deleteMailTemplate(@PathVariable Integer mailtSq) {
+		int result = mailTemplateService.deleteMailTemplate(mailtSq);
+		
+		if (result > 0) {
+			return super.ok(message.getMessage("SUCC_0003"));
+		} else {
+			return super.error(message.getMessage("FAIL_0003"));
+		}
+		
+	}
+
 	/**
 	 * 메일템플릿코너 삭제
 	 * @param mailtcSq - 메일템플릿코너일련번호

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

@@ -427,6 +427,13 @@
 	var goodsStatList = gagajf.convertToArray([[${goodsStatList}]]);
 	var mtcgGridOptions;
 	var mode = $('#mailTemplateDetailForm input[name=mode]').val();
+	var mtInfo;
+	var useYn;
+	
+	if (mode == 'U') {
+		mtInfo = [[${mtInfo}]];
+		useYn = mtInfo.useYn;
+	}
 	
 	var columnDefs = [
 		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
@@ -784,7 +791,8 @@
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
 			sureBtnClick: function() {
-				var actionUrl = '/marketing/mailtemplate/delete/' + $('input[name=mailtSq]').val();
+				var actionUrl = '/marketing/mailtemplate/delete/' + $('#mailTemplateDetailForm input[name=mailtSq]').val();
+				mcxDialog.alert(actionUrl);
 				gagajf.ajaxJsonSubmit(actionUrl, null, function() {
 					uifnPopupClose('popupMailTemplateDetail');
 					$('#btnSearch').trigger('click');
@@ -853,6 +861,11 @@
 			$('#mtcorner').show(); // 상품전시코너 영역 노출
 			fnGetMailTemplateCorner(); // 상품전시코너 조회
 		}
+		
+		// 삭제 버튼 처리
+		if (useYn == 'N') {
+			$('#btnDeleteMailTemplate').hide();
+		}
 	});
 /*]]>*/
 </script>