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

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="사용할 포인트를 입력해주세요.">
+										<input type="text" name="pntDcAmtStr" class="form_control" maxlength="11" placeholder="사용할 포인트를 입력해주세요." onkeypress="return checkNumber(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="사용할 금액을 입력해주세요.">
+									<input type="text" name="gfcdUseAmtStr" class="form_control" maxlength="11" placeholder="사용할 금액을 입력해주세요." onkeypress="return checkNumber(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

@@ -1780,9 +1780,9 @@ var prePntDcAmtReset = function() {
 			
 			// 선포인트적용
 			if ($(this).val() == "Y") {
-				$("#prePntDcAmt").text(getZeroMinusDelAmt(rmPrePntAmt)+"원");
+				$("#prePntDcAmt").text(getZeroMinusDelAmt(rmPrePntAmt)+" 원");
 			} else {
-				$("#prePntDcAmt").text("0원");
+				$("#prePntDcAmt").text("0 원");
 			}
 			
 			// 쿠폰할인금액 SUM
@@ -1790,7 +1790,7 @@ var prePntDcAmtReset = function() {
 		});
 	});
 
-	$("#prePntDcAmt").text(getZeroMinusDelAmt(rmPrePntAmt)+"원");
+	$("#prePntDcAmt").text(getZeroMinusDelAmt(rmPrePntAmt)+" 원");
 
 	// 포인트기능 리렛
 	pntDcAmtReset();