Merge remote-tracking branch 'origin/jsh77b' into develop

src/main/webapp/WEB-INF/views/web/order/OrderCouponApplyPopWeb.html

@@ -13,12 +13,15 @@
 				<th:block th:if="${goodsApplyCpnList.size() > 0}">
 					<h6>상품쿠폰</h6>
 					<div class="area_item_coupon">
-						<th:block th:each="goods, i : ${goodsApplyCpnList}">
+						<th:block th:each="goods, i : ${goodsApplyCpnList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 							<th:block th:if="${goods.goodsCpnList.size() > 0}">
 								<div class="apply_item goodsCpn">
 									<div class="item_gd">
 										<figure>
-											<span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
+											<span class="thumb">
+												<img th:src="${imageUrl + '/' + goods.sysImgNm}" src="/" width="100%" alt="">
+											</span>
+											
 											<figcaption>
 												<div class="brand" th:text="${goods.brandEnm}+' '+${goods.brandKnm}"></div>
 												<div class="name" th:text="${goods.goodsNm}"></div>

src/main/webapp/WEB-INF/views/web/order/OrderDcAmtInfoWeb.html

@@ -139,7 +139,7 @@
 								<!-- 스타일 포인트 3만원 이상 결제시 노출 -->
 								<th:block th:if="${orgGoodsSumAmt} >= 30000">
 									<div class="input_wrap">
-										<input type="text" name="pntDcAmtStr" class="form_control" maxlength="11" placeholder="사용할 포인트를 입력해주세요." onkeypress="return checkNumber(event);">
+										<input type="text" name="pntDcAmtStr" class="form_control" maxlength="11" placeholder="사용할 포인트를 입력해주세요." onkeypress="return checkNumber(event);" onblur="return checkPntDcAmt(event);">
 										<button type="button" class="btn btn_dark btn_sm" id="btn_point_apply">
 											<span>적용</span>
 										</button>
@@ -174,7 +174,7 @@
 							<div class="form_field">
 								<input type="hidden" name="rmGfcdAmt" th:value="${rmGfcdAmt}"/>
 								<div class="input_wrap">
-									<input type="text" name="gfcdUseAmtStr" class="form_control" maxlength="11" placeholder="사용할 금액을 입력해주세요." onkeypress="return checkNumber(event);">
+									<input type="text" name="gfcdUseAmtStr" class="form_control" maxlength="11" placeholder="사용할 금액을 입력해주세요." onkeypress="return checkNumber(event);" onblur="return checkGfcdAmt(event);">
 									<button type="button" class="btn btn_dark btn_sm" id="btn_gfcd_apply">
 										<span>적용</span>
 									</button>

src/main/webapp/WEB-INF/views/web/order/OrderFormWeb.html

@@ -2229,6 +2229,19 @@ var checkNumber = function(event) {
 	}
 	return false;
 }
+
+// 포인트 유효성 체크
+var checkPntDcAmt = function(event) {
+
+	return true;
+}
+
+//포인트 유효성 체크 
+var checkGfcdAmt = function(event) {
+	
+	return true;
+}
+
 </script>
 
 </th:block>

src/main/webapp/WEB-INF/views/web/order/OrderListInfoWeb.html

@@ -43,11 +43,11 @@
 				</th:block>
 		
 				<div class="gd_list">
-					<th:block th:each="goods, i : ${delvAllCart}">
+					<th:block th:each="goods, i : ${delvAllCart}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 						<div class="item_gd">
 							<figure>
 								<span class="thumb">
-									<img th:src="${IMG_PATH} + '/' + ${goods.sysImgNm}" src="/" width="100%" alt="">
+									<img th:src="${imageUrl + '/' + goods.sysImgNm}" src="/" width="100%" alt="">
 								</span>
 								<figcaption>
 									<div class="brand" th:text="${goods.brandEnm} + ' ' + ${goods.brandKnm}"></div>