Merge branch 'style' into yujung_style

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

@@ -1011,18 +1011,24 @@
 		/* TsfCoupon.getMypageCouponInfo*/
 		SELECT COUNT(*) AS ALL_COUPON_CNT
 		    ,(  SELECT COUNT(*) AS USE_COUPON
-		        FROM TB_CUST_COUPON CC 
+		        FROM TB_CUST_COUPON CC
+		        INNER JOIN TB_COUPON C
+		        ON CC.CPN_ID = C.CPN_ID
+		        AND C.CPN_STAT = 'G232_11'
 		        WHERE 1=1
 		        AND CC.CUST_NO = #{custNo}
 		        AND NOW() BETWEEN CC.AVAIL_STDT AND CC.AVAIL_EDDT 
 		        AND CC.USED_DT IS NULL ) AS USE_COUPON_CNT
 		    ,(  SELECT COUNT(*) AS USE_COUPON
-		        FROM TB_CUST_COUPON 
+		        FROM TB_CUST_COUPON CC
+		        INNER JOIN TB_COUPON C
+		        ON CC.CPN_ID = C.CPN_ID
+		        AND C.CPN_STAT = 'G232_11'
 		        WHERE 1=1
-		        AND CUST_NO = #{custNo}
-		        AND NOW() BETWEEN AVAIL_STDT AND AVAIL_EDDT 
-		        AND NOW() BETWEEN DATE_ADD(AVAIL_EDDT , INTERVAL -7 DAY) AND AVAIL_EDDT 
-		        AND USED_DT IS NULL) AS EXPIRE_COUPON_CNT
+		        AND CC.CUST_NO = #{custNo}
+		        AND NOW() BETWEEN CC.AVAIL_STDT AND CC.AVAIL_EDDT 
+		        AND NOW() BETWEEN DATE_ADD(CC.AVAIL_EDDT , INTERVAL -7 DAY) AND CC.AVAIL_EDDT 
+		        AND CC.USED_DT IS NULL) AS EXPIRE_COUPON_CNT
 		FROM TB_CUST_COUPON CC INNER JOIN TB_COUPON C
 		ON CC.CPN_ID = C.CPN_ID 
 		WHERE 1=1

src/main/webapp/WEB-INF/views/mob/mypage/MypageCancelFormMob.html

@@ -430,7 +430,7 @@ var fnCancel = function() {
 	} else {
 		// 취소 처리 가능 여부 조회
 		gagajf.ajaxJsonSubmit('/mypage/wms/cancel/available', jsonData, function (result) {
-			if (result.cancelYn == 'Y' && chk > 0) {
+			if (result.cancelYn == 'Y') {
 				// 취소 처리
 				gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
 					cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);

src/main/webapp/WEB-INF/views/web/mypage/MypageCancelFormWeb.html

@@ -334,7 +334,7 @@
 		} else {
 			// 취소 처리 가능 여부 조회
 			gagajf.ajaxJsonSubmit('/mypage/wms/cancel/available', jsonData, function (result) {
-				if (result.cancelYn == 'Y' && chk > 0) {
+				if (result.cancelYn == 'Y') {
 					// 취소 처리
 					gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
 						cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);

src/main/webapp/ux/plugins/gaga/gaga.validation.js

@@ -590,7 +590,7 @@ var gagajf = {
 			success : function(result) {
 				if (typeof(result.status) == 'undefined' || result.status == 200) { // 성공
 					if (!gagajf.isNull(result.message)) {
-						mcxDialog.alertC(result.message, {
+						mcxDialog.alertC(result.message.replaceAll("&lt;", "<").replaceAll("&gt;", ">"), {
 							sureBtnText: "확인",
 							sureBtnClick: function() {
 								if (typeof(callbackFn) == "function") {
@@ -605,7 +605,7 @@ var gagajf = {
 					}
 				} else { // 실패
 					if (!gagajf.isNull(result.error.message)) {
-						mcxDialog.alert(result.error.message);
+						mcxDialog.alert(result.error.message.replaceAll("&lt;", "<").replaceAll("&gt;", ">"));
 					}
 
 					return;
@@ -668,7 +668,7 @@ var gagajf = {
 			success : function(result) {
 				if (typeof(result.status) == 'undefined' || result.status == 200) { // 성공
 					if (!gagajf.isNull(result.message)) {
-						mcxDialog.alertC(result.message, {
+						mcxDialog.alertC(result.message.replaceAll("&lt;", "<").replaceAll("&gt;", ">"), {
 							sureBtnText: "확인",
 							sureBtnClick: function() {
 								if (typeof(callbackFn) == "function") {
@@ -684,7 +684,7 @@ var gagajf = {
 				} else { // 실패
 					console.log(result.error);
 					if (!gagajf.isNull(result.error.message)) {
-						mcxDialog.alert(result.error.message);
+						mcxDialog.alert(result.error.message.replaceAll("&lt;", "<").replaceAll("&gt;", ">"));
 					}
 
 					return;