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

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

@@ -1776,10 +1776,14 @@ var prePntDcAmtReset = function() {
 		
 		// 버튼기능 구현
 		$(this).on("click", function(){
-			var rmPrePntAmt 		= parseInt($("#orderForm input[name='rmPrePntAmt']").val());
+			var rmPrePntAmt = parseInt($("#orderForm input[name='rmPrePntAmt']").val());
 			
 			// 선포인트적용
-			$("#prePntDcAmt").text(getZeroMinusDelAmt(rmPrePntAmt)+"원");
+			if ($(this).val() == "Y") {
+				$("#prePntDcAmt").text(getZeroMinusDelAmt(rmPrePntAmt)+"원");
+			} else {
+				$("#prePntDcAmt").text("0원");
+			}
 			
 			// 쿠폰할인금액 SUM
 			custCpnSumAmtCal();
@@ -2217,6 +2221,14 @@ var getZeroMinusDelAmt = function(tempAmt) {
 	
 	return rtnAmtStr;
 }
+
+// 숫자만체크
+var checkNumber = function(event) {
+	if (event.key >= 0 && event.key <= 9) {
+		return true;
+	}
+	return false;
+}
 </script>
 
 </th:block>