테스트 수정

src/main/webapp/WEB-INF/views/mob/goods/GoodsCouponFormMob.html

@@ -39,12 +39,22 @@
 									<span>1인 최대 <th:block th:text="${(goodsCoupon.custPubLimitQty > 0) ? #numbers.formatInteger(goodsCoupon.custPubLimitQty, 0,'COMMA') +'장' : '무제한'}"></span>
 								</p>
 							</div>
-							<th:block th:if="${goodsCoupon.custPubLimitQty > 0 and goodsCoupon.custPubLimitQty <= goodsCoupon.custCouponCnt}">
+							<div class="btn_group_flex">
+								<div>
+									<button type="button" class="btn btn_dark" id="btn_result_coupon" 
+											th:disabled="${goodsCoupon.custPubLimitQty > 0 and goodsCoupon.custPubLimitQty <= goodsCoupon.custCouponCnt}"
+											th:attr="cpnId=${goodsCoupon.cpnId}" th:id="${'coupon_'+goodsCoupon.cpnId}" onclick="fnGoodsCouponDown(this);">
+										<span>쿠폰받기</span>
+										<span>받기완료</span>
+									</button>
+								</div>
+							</div>
+							<!-- <th:block th:if="${goodsCoupon.custPubLimitQty > 0 and goodsCoupon.custPubLimitQty <= goodsCoupon.custCouponCnt}">
 							<button type="button" class="btn btn_dark btn_block btn_coupon_down"   disabled="disabled"><span>받기완료</span></button>
 							</th:block>
 							<th:block th:unless="${goodsCoupon.custPubLimitQty > 0 and goodsCoupon.custPubLimitQty <= goodsCoupon.custCouponCnt}">
 							<button type="button" class="btn btn_dark btn_block btn_coupon_down" th:attr="cpnId=${goodsCoupon.cpnId}" th:id="${'coupon_'+goodsCoupon.cpnId}" onclick="fnGoodsCouponDown(this);"><span>쿠폰받기</span></button>
-							</th:block>
+							</th:block> -->
 						</div>
 					</li>
 				</ul>
@@ -72,8 +82,8 @@
 		let cpnId = $obj.attr('cpnId');
 		let goodsCd = $('#goodsCouponForm input[name=goodsCd]').val();
 		
-		 gagajf.ajaxJsonSubmit(_PAGE_GOODS_CPN_DOWNLOAD, JSON.stringify({goodsCd: goodsCd, cpnId: cpnId}), fnGoodsCouponCallBack);
-		 
+		gagajf.ajaxJsonSubmit(_PAGE_GOODS_CPN_DOWNLOAD, JSON.stringify({goodsCd: goodsCd, cpnId: cpnId}), fnGoodsCouponCallBack);
+		
 	//쿠폰이 발급되었습니다
 	//죄송합니다. 쿠폰이 모두 소진되었습니다
 	//죄송합니다. 해당 쿠폰은 다운로드가 불가합니다.
@@ -90,13 +100,13 @@
 				if (coupon.cpnId == cpnId){
 					if (Number(coupon.custPubLimitQty) > 0){
 						if (Number(coupon.custPubLimitQty) <= Number(coupon.custCouponCnt)){
-							$('#coupon_'+ coupon.cpnId).html('<span>받기완료</span>');
+							//$('#coupon_'+ coupon.cpnId).html('<span>받기완료</span>');
 							$('#coupon_'+ coupon.cpnId).attr('disabled', true);
 						}
 					}
 					if (Number(coupon.TotPubLimitQty) > 0){
 						if (Number(coupon.TotPubLimitQty) <= Number(coupon.CustCouponCnt)){
-							$('#coupon_'+ coupon.cpnId).html('<span>받기완료</span>');
+							//$('#coupon_'+ coupon.cpnId).html('<span>받기완료</span>');
 							$('#coupon_'+ coupon.cpnId).attr('disabled', true);
 						}
 					}

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailFormMob.html

@@ -133,9 +133,13 @@
 						<div class="form_field">
 							<div th:each="goodsOption2, status : ${goodsOption2List}">
 								<input type="radio" name="opt"  th:id="${goodsOption2.optCd}" th:disabled="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}" 
-										th:attr="addPrice=${goodsOption2.addPrice}, optCd1=${goodsOption2.optCd1}, optCd2=${goodsOption2.optCd2}, optCd=${goodsOption2.optCd}"
-										 />
+										th:attr="addPrice=${goodsOption2.addPrice}, optCd1=${goodsOption2.optCd1}, optCd2=${goodsOption2.optCd2}, optCd=${goodsOption2.optCd}"/>
+								<th:block th:if="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}">
+								<label th:for="${goodsOption2.optCd}">90</span></label>
+								</th:block>
+								<th:block th:unless="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}">
 								<label th:for="${goodsOption2.optCd}" th:onclick="fnViewStock(this, [[${goodsInfo.goodsCd}]],[[${goodsOption2.optCd}]],[[${goodsOption2.optCd1}]],[[${goodsOption2.optCd2}]],[[${goodsInfo.minOrdQty}]], [[${goodsInfo.maxOrdQty}]] )"><span th:text="${goodsOption2.optCd2}">90</span></label>
+								</th:block>
 							</div>
 						</div>
 					</div>
@@ -2080,8 +2084,6 @@
 			return false;
 		});   
 
-	   
-		
 		fnOptionSoldout();
 		
 		// 광고 스크립트용

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailQnaFormMob.html

@@ -138,6 +138,7 @@
 		}else{
 			$('.nodata').show();
 			$('#btnMore').parent().hide();
+			$('.form_field.check_secret').hide();
 		}
 	}
 	

src/main/webapp/WEB-INF/views/web/goods/GoodsDetailQnaFormWeb.html

@@ -32,7 +32,7 @@
 		</div>
 		<div class="qna_list">
 			<!-- 나열조건결과 있을 때 노출 내용 -->
-			<div class="form_field">
+			<div class="form_field check_secret">
 				<input id="except_secret" name="except_secret" type="checkbox"  onclick="fnGoodsQnaList();"><label for="except_secret"><span>비밀글제외</span></label>
 				<input  type="hidden" name="secretYn" >
 			</div>
@@ -84,7 +84,7 @@
 	}
 	
 	var fnGoodsQnaListCallback = function(result) {
-		$('#ulGoodsQna').html('');   
+		$('#ulGoodsQna').html('');
 		$('#goodsQnaForm').find('.nodata').hide();
 		// 목록
 		if (result.dataList != null && result.dataList.length > 0) {
@@ -141,6 +141,7 @@
 		} else {
 			$('#goodsQnaForm').find('.nodata').show();
 			$('#goodsQnaForm').find('.ui_foot').hide();
+			$('#goodsQnaForm').find('.form_field.check_secret').hide();
 		}
 		
 		// Create pagination