Преглед изворни кода

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

jsshin пре 4 година
родитељ
комит
538fa86cd2

+ 1 - 0
src/main/java/com/style24/persistence/mybatis/shop/TsfDelivery.xml

@@ -57,6 +57,7 @@
 		/*TssDelivery.updateTbOrderDtlStat*/
 		UPDATE TB_ORDER_DETAIL SET
 			  ORD_DTL_STAT = #{ordDtlStat}
+			, DELV_EDDT    = NOW()
 			, UPD_NO       = #{regNo}
 			, UPD_DT       = NOW()
 		WHERE ORD_DTL_NO   = #{ordDtlNo}

+ 10 - 9
src/main/webapp/WEB-INF/views/mob/mypage/MypageExchangeFormMob.html

@@ -465,10 +465,11 @@ var fnExchange = function() {
 	}
 
 	// 교환 필요 데이터 설정
+	let wdGb			= $('#exchangeForm input[name=wdGb]:radio:checked').val();
 	let data 			= {};
 	data.ordNo 			= oneData.ordNo;
 	data.isCustomer 	= isCustomer;
-	data.wdGb 			= $('#exchangeForm input[name=wdGb]:radio:checked').val();
+	data.wdGb 			= wdGb;
 	data.wdInvoiceNo 	= $('#exchangeForm input[name=wdInvoiceNo]').val();
 	data.recipNm 		= $('#exchangeForm input[name=recipNm]').val();
 	data.recipPhnno 	= $('#exchangeForm input[name=recipPhnno]').val();
@@ -479,14 +480,14 @@ var fnExchange = function() {
 	data.delvMemo 		= $('#exchangeForm input[name=delvMemo]').val();
 	data.chgReason 		= $('#exchangeForm input[name=chgReason]').val();
 	data.chgMemo 		= $('#exchangeForm textarea[name=chgMemo]').val();
-	data.chgerNm 		= $('#exchangeForm input[name=chgerNm]').val();
-	data.chgerPhnno 	= $('#exchangeForm input[name=chgerPhnno]').val();
-	data.chgerTelno 	= $('#exchangeForm input[name=chgerTelno]').val();
-	data.chgerEmail 	= $('#exchangeForm input[name=chgerEmail]').val();
-	data.chgerZipcode 	= $('#exchangeForm input[name=chgerZipcode]').val();
-	data.chgerBaseAddr 	= $('#exchangeForm input[name=chgerBaseAddr]').val();
-	data.chgerDtlAddr 	= $('#exchangeForm input[name=chgerDtlAddr]').val();
-	data.chgerRtnMemo 	= $('#exchangeForm input[name=chgerRtnMemo]').val();
+	data.chgerNm 		= wdGb == 'W' ? $('#exchangeForm input[name=chgerNm]').val() : '';
+	data.chgerPhnno 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerPhnno]').val() : '';
+	data.chgerTelno 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerTelno]').val() : '';
+	data.chgerEmail 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerEmail]').val() : '';
+	data.chgerZipcode 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerZipcode]').val() : '';
+	data.chgerBaseAddr 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerBaseAddr]').val() : '';
+	data.chgerDtlAddr 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerDtlAddr]').val() : '';
+	data.chgerRtnMemo 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerRtnMemo]').val() : '';
 	data.addPayCost 	= addPayCost;
 	data.addPayAmt 		= 0;
 	data.cancelReqList 	= cancelReqList;

+ 8 - 7
src/main/webapp/WEB-INF/views/mob/mypage/MypageReturnFormMob.html

@@ -577,6 +577,7 @@ var fnReturn = function() {
 
 	// 추가배송비 PG 처리
 	let addPayCost 			= $('#returnForm input[name=addPayCost]').val();
+	let wdGb				= $('#returnForm input[name=wdGb]:radio:checked').val();
 
 	let data 				= {};
 	data.ordNo 				= oneData.ordNo;
@@ -587,13 +588,13 @@ var fnReturn = function() {
 	data.accountNm 			= $('#returnForm input[name=accountNm]').val();
 	data.bankCd 			= $('#returnForm input[name=bankCd]').val();
 	data.isCustomer 		= isCustomer;
-	data.wdGb 				= $('#returnForm input[name=wdGb]:radio:checked').val();
-	data.chgerNm 			= $('#returnForm input[name=chgerNm]').val();
-	data.chgerZipcode 		= $('#returnForm input[name=chgerZipcode]').val();
-	data.chgerBaseAddr 		= $('#returnForm input[name=chgerBaseAddr]').val();
-	data.chgerDtlAddr 		= $('#returnForm input[name=chgerDtlAddr]').val();
-	data.chgerPhnno 		= $('#returnForm input[name=chgerPhnno]').val();
-	data.chgerRtnMemo 		= $('#returnForm input[name=chgerRtnMemo]').val();
+	data.wdGb 				= wdGb;
+	data.chgerNm 			= wdGb == 'W' ? $('#returnForm input[name=chgerNm]').val() : '';
+	data.chgerZipcode 		= wdGb == 'W' ? $('#returnForm input[name=chgerZipcode]').val() : '';
+	data.chgerBaseAddr 		= wdGb == 'W' ? $('#returnForm input[name=chgerBaseAddr]').val() : '';
+	data.chgerDtlAddr 		= wdGb == 'W' ? $('#returnForm input[name=chgerDtlAddr]').val() : '';
+	data.chgerPhnno 		= wdGb == 'W' ? $('#returnForm input[name=chgerPhnno]').val() : '';
+	data.chgerRtnMemo 		= wdGb == 'W' ? $('#returnForm input[name=chgerRtnMemo]').val() : '';
 	data.ordDtlNoArr 		= ordDtlNoArr;
 	data.wdInvoiceNo 		= $('#returnForm input[name=wdInvoiceNo]').val();
 	data.addPayCost 		= addPayCost;

+ 10 - 9
src/main/webapp/WEB-INF/views/mob/mypage/NoMemberExchangeFormMob.html

@@ -467,10 +467,11 @@ var fnExchange = function() {
 	}
 
 	// 교환 필요 데이터 설정
+	let wdGb			= $('#exchangeForm input[name=wdGb]:radio:checked').val();
 	let data 			= {};
 	data.ordNo 			= oneData.ordNo;
 	data.isCustomer 	= isCustomer;
-	data.wdGb 			= $('#exchangeForm input[name=wdGb]:radio:checked').val();
+	data.wdGb 			= wdGb;
 	data.wdInvoiceNo 	= $('#exchangeForm input[name=wdInvoiceNo]').val();
 	data.recipNm 		= $('#exchangeForm input[name=recipNm]').val();
 	data.recipPhnno 	= $('#exchangeForm input[name=recipPhnno]').val();
@@ -481,14 +482,14 @@ var fnExchange = function() {
 	data.delvMemo 		= $('#exchangeForm input[name=delvMemo]').val();
 	data.chgReason 		= $('#exchangeForm input[name=chgReason]').val();
 	data.chgMemo 		= $('#exchangeForm textarea[name=chgMemo]').val();
-	data.chgerNm 		= $('#exchangeForm input[name=chgerNm]').val();
-	data.chgerPhnno 	= $('#exchangeForm input[name=chgerPhnno]').val();
-	data.chgerTelno 	= $('#exchangeForm input[name=chgerTelno]').val();
-	data.chgerEmail 	= $('#exchangeForm input[name=chgerEmail]').val();
-	data.chgerZipcode 	= $('#exchangeForm input[name=chgerZipcode]').val();
-	data.chgerBaseAddr 	= $('#exchangeForm input[name=chgerBaseAddr]').val();
-	data.chgerDtlAddr 	= $('#exchangeForm input[name=chgerDtlAddr]').val();
-	data.chgerRtnMemo 	= $('#exchangeForm input[name=chgerRtnMemo]').val();
+	data.chgerNm 		= wdGb == 'W' ? $('#exchangeForm input[name=chgerNm]').val() : '';
+	data.chgerPhnno 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerPhnno]').val() : '';
+	data.chgerTelno 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerTelno]').val() : '';
+	data.chgerEmail 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerEmail]').val() : '';
+	data.chgerZipcode 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerZipcode]').val() : '';
+	data.chgerBaseAddr 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerBaseAddr]').val() : '';
+	data.chgerDtlAddr 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerDtlAddr]').val() : '';
+	data.chgerRtnMemo 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerRtnMemo]').val() : '';
 	data.addPayCost 	= addPayCost;
 	data.addPayAmt 		= 0;
 	data.cancelReqList 	= cancelReqList;

+ 8 - 7
src/main/webapp/WEB-INF/views/mob/mypage/NoMemberReturnFormMob.html

@@ -582,6 +582,7 @@ var fnReturn = function() {
 
 	// 추가배송비 PG 처리
 	let addPayCost 			= $('#returnForm input[name=addPayCost]').val();
+	let wdGb				= $('#returnForm input[name=wdGb]:radio:checked').val();
 
 	let data 				= {};
 	data.ordNo 				= oneData.ordNo;
@@ -592,13 +593,13 @@ var fnReturn = function() {
 	data.accountNm 			= $('#returnForm input[name=accountNm]').val();
 	data.bankCd 			= $('#returnForm input[name=bankCd]').val();
 	data.isCustomer 		= isCustomer;
-	data.wdGb 				= $('#returnForm input[name=wdGb]:radio:checked').val();
-	data.chgerNm 			= $('#returnForm input[name=chgerNm]').val();
-	data.chgerZipcode 		= $('#returnForm input[name=chgerZipcode]').val();
-	data.chgerBaseAddr 		= $('#returnForm input[name=chgerBaseAddr]').val();
-	data.chgerDtlAddr 		= $('#returnForm input[name=chgerDtlAddr]').val();
-	data.chgerPhnno 		= $('#returnForm input[name=chgerPhnno]').val();
-	data.chgerRtnMemo 		= $('#returnForm input[name=chgerRtnMemo]').val();
+	data.wdGb 				= wdGb;
+	data.chgerNm 			= wdGb == 'W' ? $('#returnForm input[name=chgerNm]').val() : '';
+	data.chgerZipcode 		= wdGb == 'W' ? $('#returnForm input[name=chgerZipcode]').val() : '';
+	data.chgerBaseAddr 		= wdGb == 'W' ? $('#returnForm input[name=chgerBaseAddr]').val() : '';
+	data.chgerDtlAddr 		= wdGb == 'W' ? $('#returnForm input[name=chgerDtlAddr]').val() : '';
+	data.chgerPhnno 		= wdGb == 'W' ? $('#returnForm input[name=chgerPhnno]').val() : '';
+	data.chgerRtnMemo 		= wdGb == 'W' ? $('#returnForm input[name=chgerRtnMemo]').val() : '';
 	data.ordDtlNoArr 		= ordDtlNoArr;
 	data.wdInvoiceNo 		= $('#returnForm input[name=wdInvoiceNo]').val();
 	data.addPayCost 		= addPayCost;

+ 2 - 2
src/main/webapp/WEB-INF/views/mob/planning/PlanningDetailFormMob.html

@@ -759,7 +759,7 @@ if(template.length>0){
 }
 
 if(template.length>0){
-	if(review.length>0 || reviewContent[0].title != ''){
+	if(review.length>0 || (reviewContent.length>0 && !gagajf.isNull(reviewContent[0].title)) ){
 		$("#G082_10").show();
 		var html = '';
 		
@@ -882,7 +882,7 @@ if(image.length>0){
 
 
 if(template.length>0){
-	if(coupon.length>0 || (couponContent[0].title != '' && couponContent[0].title != null) || (couponContent[0].cpnNote0 != '' && couponContent[0].cpnNote0 != null)){
+	if(coupon.length>0 || (couponContent.length > 0 && !gagajf.isNull(couponContent[0].title)) || (couponContent.length > 0 && !gagajf.isNull(couponContent[0].cpnNote0))){
 		$("#G082_20").show();
 		
 		var html = '';

+ 9 - 9
src/main/webapp/WEB-INF/views/mob/planning/PlanningEventPollFormMob.html

@@ -367,15 +367,15 @@ $(document).ready(function(){
 		}
 	});
 	
-	$('.ev .survey_wrap .survey_con .survey_row input[type="radio"]').change(function(){
-		if ($('.etc_radio').is(':checked')) {
-			// $('.etc_input').removeAttr('disabled');
-			$('.etc_input').css({'visibility': 'visible'}); 
-		} else {
-			// $('.etc_input').attr('disabled', true);
-			$('.etc_input').css({'visibility': 'hidden'}); 
-		}   
-	});				
+	// $('.ev .survey_wrap .survey_con .survey_row input[type="radio"]').change(function(){
+	// 	if ($('.etc_radio').is(':checked')) {
+	// 		// $('.etc_input').removeAttr('disabled');
+	// 		$('.etc_input').css({'visibility': 'visible'});
+	// 	} else {
+	// 		// $('.etc_input').attr('disabled', true);
+	// 		$('.etc_input').css({'visibility': 'hidden'});
+	// 	}
+	// });
 	
 	
 })

+ 10 - 9
src/main/webapp/WEB-INF/views/web/mypage/MypageExchangeFormWeb.html

@@ -459,10 +459,11 @@
 		}
 
 		// 교환 필요 데이터 설정
+		let wdGb = $('#exchangeForm input[name=wdGb]:radio:checked').val();
 		let data = {};
 		data.ordNo = oneData.ordNo;
 		data.isCustomer = isCustomer;
-		data.wdGb = $('#exchangeForm input[name=wdGb]:radio:checked').val();
+		data.wdGb = wdGb;
 		data.wdInvoiceNo = $('#exchangeForm input[name=wdInvoiceNo]').val();
 		data.recipNm = $('#exchangeForm input[name=recipNm]').val();
 		data.recipPhnno = $('#exchangeForm input[name=recipPhnno]').val();
@@ -473,14 +474,14 @@
 		data.delvMemo = $('#exchangeForm input[name=delvMemo]').val();
 		data.chgReason = $('#exchangeForm input[name=chgReason]').val();
 		data.chgMemo = $('#exchangeForm textarea[name=chgMemo]').val();
-		data.chgerNm = $('#exchangeForm input[name=chgerNm]').val();
-		data.chgerPhnno = $('#exchangeForm input[name=chgerPhnno]').val();
-		data.chgerTelno = $('#exchangeForm input[name=chgerTelno]').val();
-		data.chgerEmail = $('#exchangeForm input[name=chgerEmail]').val();
-		data.chgerZipcode = $('#exchangeForm input[name=chgerZipcode]').val();
-		data.chgerBaseAddr = $('#exchangeForm input[name=chgerBaseAddr]').val();
-		data.chgerDtlAddr = $('#exchangeForm input[name=chgerDtlAddr]').val();
-		data.chgerRtnMemo = $('#exchangeForm input[name=chgerRtnMemo]').val();
+		data.chgerNm = wdGb == 'W' ? $('#exchangeForm input[name=chgerNm]').val() : '';
+		data.chgerPhnno = wdGb == 'W' ? $('#exchangeForm input[name=chgerPhnno]').val() : '';
+		data.chgerTelno = wdGb == 'W' ? $('#exchangeForm input[name=chgerTelno]').val() : '';
+		data.chgerEmail = wdGb == 'W' ? $('#exchangeForm input[name=chgerEmail]').val() : '';
+		data.chgerZipcode = wdGb == 'W' ? $('#exchangeForm input[name=chgerZipcode]').val() : '';
+		data.chgerBaseAddr = wdGb == 'W' ? $('#exchangeForm input[name=chgerBaseAddr]').val() : '';
+		data.chgerDtlAddr = wdGb == 'W' ? $('#exchangeForm input[name=chgerDtlAddr]').val() : '';
+		data.chgerRtnMemo = wdGb == 'W' ? $('#exchangeForm input[name=chgerRtnMemo]').val() : '';
 		data.addPayCost = addPayCost;
 		data.addPayAmt = 0;
 		data.cancelReqList = cancelReqList;

+ 8 - 7
src/main/webapp/WEB-INF/views/web/mypage/MypageReturnFormWeb.html

@@ -431,6 +431,7 @@
 
 		// 추가배송비 PG 처리
 		let addPayCost = $('#returnForm input[name=addPayCost]').val();
+		let wdGb = $('#returnForm input[name=wdGb]:radio:checked').val();
 
 		let data = {};
 		data.ordNo = oneData.ordNo;
@@ -441,13 +442,13 @@
 		data.accountNm = $('#returnForm input[name=accountNm]').val();
 		data.bankCd = $('#returnForm input[name=bankCd]').val();
 		data.isCustomer = isCustomer;
-		data.wdGb = $('#returnForm input[name=wdGb]:radio:checked').val();
-		data.chgerNm = $('#chgerNm').text();
-		data.chgerZipcode = $('#returnForm input[name=chgerZipcode]').val();
-		data.chgerBaseAddr = $('#returnForm input[name=chgerBaseAddr]').val();
-		data.chgerDtlAddr = $('#returnForm input[name=chgerDtlAddr]').val();
-		data.chgerPhnno = $('#returnForm input[name=chgerPhnno]').val();
-		data.chgerRtnMemo = $('#returnForm input[name=chgerRtnMemo]').val();
+		data.wdGb = wdGb;
+		data.chgerNm = wdGb == 'W' ? $('#chgerNm').text() : '';
+		data.chgerZipcode = wdGb == 'W' ? $('#returnForm input[name=chgerZipcode]').val() : '';
+		data.chgerBaseAddr = wdGb == 'W' ? $('#returnForm input[name=chgerBaseAddr]').val() : '';
+		data.chgerDtlAddr = wdGb == 'W' ? $('#returnForm input[name=chgerDtlAddr]').val() : '';
+		data.chgerPhnno = wdGb == 'W' ? $('#returnForm input[name=chgerPhnno]').val() : '';
+		data.chgerRtnMemo = wdGb == 'W' ? $('#returnForm input[name=chgerRtnMemo]').val() : '';
 		data.ordDtlNoArr = ordDtlNoArr;
 		data.wdInvoiceNo = $('#returnForm input[name=wdInvoiceNo]').val();
 		data.addPayCost = addPayCost;

+ 10 - 9
src/main/webapp/WEB-INF/views/web/mypage/NoMemberExchangeFormWeb.html

@@ -457,12 +457,13 @@
 		}
 
 		// 교환 필요 데이터 설정
+		let wdGb = $('#exchangeForm input[name=wdGb]:radio:checked').val();
 		let data = {};
 		data.ordNo = oneData.ordNo;
 		data.ordNm = oneData.ordNm;
 		data.ordPhnno = oneData.ordPhnno;
 		data.isCustomer = isCustomer;
-		data.wdGb = $('#exchangeForm input[name=wdGb]:radio:checked').val();
+		data.wdGb = wdGb;
 		data.wdInvoiceNo = $('#exchangeForm input[name=wdInvoiceNo]').val();
 		data.recipNm = $('#exchangeForm input[name=recipNm]').val();
 		data.recipPhnno = $('#exchangeForm input[name=recipPhnno]').val();
@@ -473,14 +474,14 @@
 		data.delvMemo = $('#exchangeForm input[name=delvMemo]').val();
 		data.chgReason = $('#exchangeForm input[name=chgReason]').val();
 		data.chgMemo = $('#exchangeForm textarea[name=chgMemo]').val();
-		data.chgerNm = $('#exchangeForm input[name=chgerNm]').val();
-		data.chgerPhnno = $('#exchangeForm input[name=chgerPhnno]').val();
-		data.chgerTelno = $('#exchangeForm input[name=chgerTelno]').val();
-		data.chgerEmail = $('#exchangeForm input[name=chgerEmail]').val();
-		data.chgerZipcode = $('#exchangeForm input[name=chgerZipcode]').val();
-		data.chgerBaseAddr = $('#exchangeForm input[name=chgerBaseAddr]').val();
-		data.chgerDtlAddr = $('#exchangeForm input[name=chgerDtlAddr]').val();
-		data.chgerRtnMemo = $('#exchangeForm input[name=chgerRtnMemo]').val();
+		data.chgerNm = wdGb == 'W' ? $('#exchangeForm input[name=chgerNm]').val() : '';
+		data.chgerPhnno = wdGb == 'W' ? $('#exchangeForm input[name=chgerPhnno]').val() : '';
+		data.chgerTelno = wdGb == 'W' ? $('#exchangeForm input[name=chgerTelno]').val() : '';
+		data.chgerEmail = wdGb == 'W' ? $('#exchangeForm input[name=chgerEmail]').val() : '';
+		data.chgerZipcode = wdGb == 'W' ? $('#exchangeForm input[name=chgerZipcode]').val() : '';
+		data.chgerBaseAddr = wdGb == 'W' ? $('#exchangeForm input[name=chgerBaseAddr]').val() : '';
+		data.chgerDtlAddr = wdGb == 'W' ? $('#exchangeForm input[name=chgerDtlAddr]').val() : '';
+		data.chgerRtnMemo = wdGb == 'W' ? $('#exchangeForm input[name=chgerRtnMemo]').val() : '';
 		data.addPayCost = addPayCost;
 		data.addPayAmt = 0;
 		data.cancelReqList = cancelReqList;

+ 8 - 7
src/main/webapp/WEB-INF/views/web/mypage/NoMemberReturnFormWeb.html

@@ -429,6 +429,7 @@
 
 		// 추가배송비 PG 처리
 		let addPayCost = $('#returnForm input[name=addPayCost]').val();
+		let wdGb = $('#returnForm input[name=wdGb]:radio:checked').val();
 
 		let data = {};
 		data.ordNo = oneData.ordNo;
@@ -441,13 +442,13 @@
 		data.accountNm = $('#returnForm input[name=accountNm]').val();
 		data.bankCd = $('#returnForm input[name=bankCd]').val();
 		data.isCustomer = isCustomer;
-		data.wdGb = $('#returnForm input[name=wdGb]:radio:checked').val();
-		data.chgerNm = $('#chgerNm').text();
-		data.chgerZipcode = $('#returnForm input[name=chgerZipcode]').val();
-		data.chgerBaseAddr = $('#returnForm input[name=chgerBaseAddr]').val();
-		data.chgerDtlAddr = $('#returnForm input[name=chgerDtlAddr]').val();
-		data.chgerPhnno = $('#returnForm input[name=chgerPhnno]').val();
-		data.chgerRtnMemo = $('#returnForm input[name=chgerRtnMemo]').val();
+		data.wdGb = wdGb;
+		data.chgerNm = wdGb == 'W' ? $('#chgerNm').text() : '';
+		data.chgerZipcode = wdGb == 'W' ? $('#returnForm input[name=chgerZipcode]').val() : '';
+		data.chgerBaseAddr = wdGb == 'W' ? $('#returnForm input[name=chgerBaseAddr]').val() : '';
+		data.chgerDtlAddr = wdGb == 'W' ? $('#returnForm input[name=chgerDtlAddr]').val() : '';
+		data.chgerPhnno = wdGb == 'W' ? $('#returnForm input[name=chgerPhnno]').val() : '';
+		data.chgerRtnMemo = wdGb == 'W' ? $('#returnForm input[name=chgerRtnMemo]').val() : '';
 		data.ordDtlNoArr = ordDtlNoArr;
 		data.wdInvoiceNo = $('#returnForm input[name=wdInvoiceNo]').val();
 		data.addPayCost = addPayCost;

+ 2 - 2
src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html

@@ -380,7 +380,7 @@ if(planCornerList.length>0 && plan.cornerNmDispYn == "Y"){
 }
 
 if(template.length>0){
-	if(review.length>0 || reviewContent[0].title != ''){
+	if(review.length>0 || (reviewContent.length>0 && !gagajf.isNull(reviewContent[0].title))){
 		$("#G082_10").show();
 		var html = '';
 		
@@ -717,7 +717,7 @@ if(template.length>0){
 }
 
 if(template.length>0){
-	if(coupon.length>0 || (couponContent[0].title != '' && couponContent[0].title != null) || (couponContent[0].cpnNote0 != '' && couponContent[0].cpnNote0 != null)){
+	if(coupon.length>0 || (couponContent.length > 0 && !gagajf.isNull(couponContent[0].title)) || (couponContent.length > 0 && !gagajf.isNull(couponContent[0].cpnNote0))){
 		$("#G082_20").show();
 		var html = '';
 		 

+ 9 - 9
src/main/webapp/WEB-INF/views/web/planning/PlanningEventPollFormWeb.html

@@ -362,15 +362,15 @@ $(document).ready( function() {
 	});
 
 
-	$('.ev .survey_wrap .survey_con .survey_row input[type="radio"]').change(function(){
-		if ($('.etc_radio').is(':checked')) {
-			// $('.etc_input').removeAttr('disabled');
-			$('.etc_input').css({'visibility': 'visible'}); 
-		} else {
-			// $('.etc_input').attr('disabled', true);
-			$('.etc_input').css({'visibility': 'hidden'}); 
-		}   
-	});		
+	// $('.ev .survey_wrap .survey_con .survey_row input[type="radio"]').change(function(){
+	// 	if ($('.etc_radio').is(':checked')) {
+	// 		// $('.etc_input').removeAttr('disabled');
+	// 		$('.etc_input').css({'visibility': 'visible'});
+	// 	} else {
+	// 		// $('.etc_input').attr('disabled', true);
+	// 		$('.etc_input').css({'visibility': 'hidden'});
+	// 	}
+	// });
 });