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

src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -171,8 +171,8 @@ public class TsfOrderController extends TsfBaseController {
 			
 			// 선물하기일때 PC 로 접근하면 
 			if ("P".equals(TsfSession.getFrontGb())) {
-				mav.setViewName("redirect:/cart/list/form");					// 장바구니화면이동
-				return mav;
+				//mav.setViewName("redirect:/cart/list/form");					// 장바구니화면이동
+				//return mav;
 			}
 		}
 

src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html

@@ -797,7 +797,7 @@ var freegiftInfoSet = function() {
 					var usepoint			= parseInt($(this).attr("usepoint"));
 					rmPntAmt 				= rmPntAmt - freegiftUsePnt - usepoint;
 					
-					if (rmPntAmt > 0) {
+					if (rmPntAmt < 0) {
 						mcxDialog.alert("보유포인트가 부족합니다.");
 						return false;
 					}

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

@@ -829,7 +829,7 @@ var freegiftInfoSet = function() {
 					var usepoint			= parseInt($(this).attr("usepoint"));
 					rmPntAmt 				= rmPntAmt - freegiftUsePnt - usepoint;
 					
-					if (rmPntAmt > 0) {
+					if (rmPntAmt < 0) {
 						mcxDialog.alert("보유포인트가 부족합니다.");
 						return false;
 					}