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

src/main/java/com/style24/front/biz/service/TsfPlanningService.java

@@ -145,15 +145,13 @@ public class TsfPlanningService {
 		}
 		
 		if (TsfSession.isLogin()) {
-			String grade = TsfSession.getInfo().getCustGrade();
 			// 신규회원접근가능여부 조회
-			if (grade.equals("G110_50")) {
-				plan.setCustNo(TsfSession.getInfo().getCustNo());
-				if ("N".equals(planningDao.getNewCustomerAccessibleYn(plan))) {
-					msg = "신규회원만 접근 가능합니다.";
-				}
+			plan.setCustNo(TsfSession.getInfo().getCustNo());
+			if ("N".equals(planningDao.getNewCustomerAccessibleYn(plan))) {
+				msg = "신규회원만 접근 가능합니다.";
 			}
 			
+			
 			// 고객구분접근가능여부 조회
 			plan.setCustGb(TsfSession.getCustGb());
 			if ("N".equals(planningDao.getCustomerGubunAccessibleYn(plan))) {
@@ -166,7 +164,11 @@ public class TsfPlanningService {
 			if ("N".equals(planningDao.getCustomerGradeAccessibleYn(plan))) {
 				Iterator<Plan> iter = planningDao.getCustomerGradeAccessibleList(plan).iterator();
 				while (iter.hasNext()) {
-					custGrade += iter.next().getCustGrade()+ " ";
+					custGrade += iter.next().getCustGrade();
+					
+					if (iter.hasNext()) {
+						custGrade += ", ";
+					}
 				}
 				msg = custGrade+ " 회원만 접근 가능합니다.";
 			}

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

@@ -996,11 +996,11 @@
 		/* TsfCoupon.getMypageCouponInfo*/
 		SELECT COUNT(*) AS ALL_COUPON_CNT
 		    ,(  SELECT COUNT(*) AS USE_COUPON
-		        FROM TB_CUST_COUPON 
+		        FROM TB_CUST_COUPON CC 
 		        WHERE 1=1
-		        AND CUST_NO = #{custNo}
-		        AND NOW() BETWEEN AVAIL_STDT AND AVAIL_EDDT 
-		        AND USED_DT IS NULL) AS USE_COUPON_CNT
+		        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 
 		        WHERE 1=1
@@ -1008,11 +1008,13 @@
 		        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
-		FROM TB_CUST_COUPON 
+		FROM TB_CUST_COUPON CC INNER JOIN TB_COUPON C
+		ON CC.CPN_ID = C.CPN_ID 
 		WHERE 1=1
-		  AND CUST_NO = #{custNo}
-		  AND NOW() BETWEEN AVAIL_STDT AND AVAIL_EDDT
-		  AND USED_DT IS NULL
+		  AND CC.CUST_NO = #{custNo}
+		  AND NOW() BETWEEN CC.AVAIL_STDT AND CC.AVAIL_EDDT
+		  AND CC.USED_DT IS NULL
+		  AND C.CPN_STAT = 'G232_11'
 	</select>
 	
 	<select id="getCouponDetailInfo" resultType="Coupon" parameterType="Coupon">

src/main/webapp/WEB-INF/views/mob/callcenter/OneToOneQnaFormMob.html

@@ -136,7 +136,7 @@
 									<div class="form_field">
 										<div class="ui_col_12 form_full">
 											<div class="input_wrap">
-												<textarea class="doc_contactus" name="questContent" cols="30" rows="10" style="resize: none;" placeholder="내용을 입력해 주세요. (필수)" required="required" data-valid-name="내용"></textarea>
+												<textarea class="doc_contactus" id="questContent" name="questContent" cols="30" rows="10" style="resize: none;" placeholder="내용을 입력해 주세요. (필수)" required="required" data-valid-name="내용"></textarea>
 												<p class="txt_cnt">
 													<span id="contactus_cnt" class="contactus_cnt"><em class="c_primary">0</em>/500</span>
 												</p>
@@ -284,6 +284,10 @@
 		fnSetCallcenterGnb(2);
 		
 		$('#btnQnaMore').trigger('click');
+		
+		$('#questContent').bind('input paste', function() {
+			  $(this).trigger('keyup');
+		});
 	});
 	
 	// 더보기

src/main/webapp/WEB-INF/views/mob/error/InaccessMob.html

@@ -50,11 +50,12 @@
 		<div class="wrap notfind system inspect"><!--  페이지 특정 클래스 -->
 			<div class="contGrp">
 				<h2>접근 불가</h2>
-				<p th:text="${inaccessibleMsg}">모바일웹에서만 접근이 가능합니다.</p>
+				<p th:text="${inaccessibleMsg}"></p>
 			</div>
 			<div class="btn_group">
-				<button class="btn btn_default" onclick="fnGoToHome();"><span>홈으로 이동</span></button>
+				<button class="btn btn_default" th:if="${loginYn == 'Y'}" onclick="fnGoToHome();"><span>홈으로 이동</span></button>
 				<button class="btn btn_dark" onclick="javascript:history.back(-1);"><span>목록으로 이동</span></button>
+				<button class="btn btn_default" th:if="${loginYn == 'N'}" onclick="fnGoToLogin();"><span>로그인</span></button>
 			</div>
 		</div>
 	</div>
@@ -64,6 +65,9 @@
 	let fnGoToHome = function() {
 		document.location.href = '/';
 	}
+	let fnGoToLogin = function() {
+		document.location.href = '/signin';
+	}
 </script>
 
 </body>

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

@@ -169,7 +169,7 @@
 								<th>계좌번호</th>
 								<td>
 									<div class="input_wrap certi_wrap">
-										<input type="text" id="accountNo" name="accountNo" class="form_control" maxlength="20" data-valid-type="numeric"  placeholder="계좌번호를 입력해 주세요"/>
+										<input type="number" pattern="\d*" id="accountNo" name="accountNo" class="form_control" maxlength="20" data-valid-type="numeric"  placeholder="계좌번호를 입력해 주세요"/>
 										<button type="button" id="btnAccountCheck" class="btn btn_dark">
 											<span>계좌인증</span>
 										</button>