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

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

@@ -252,6 +252,13 @@ public class TsfNoMemberController extends TsfBaseController {
 			order.setOrdPhnno(order.getOrdPhnno().replaceAll("(\\d{3})(\\d{3,4})(\\d{4})", "$1-$2-$3"));
 		}
 		boolean isFind = orderService.getPagingOrdNoListCount(order) > 0;
+
+		if (isFind) {
+			TsfSession.setAttribute("noMemberOrdNm",order.getOrdNm());
+			TsfSession.setAttribute("noMemberOrdNo", String.valueOf(order.getOrdNo()));
+			TsfSession.setAttribute("noMemberPhnno",order.getOrdPhnno());
+		}
+
 		result.setBoolean("isFind", isFind);
 		return result;
 	}

src/main/webapp/WEB-INF/views/mob/customer/NonCustOrderConfirmFormMob.html

@@ -91,14 +91,14 @@
 		if (!gagajf.validation($('#nonCustOrderForm'))) {
 			return;
 		}
-		gagajf.ajaxFormSubmit("/noMember/order/info/validation",'#nonCustOrderForm', fnOrderInfoCallback)
+		gagajf.ajaxFormSubmit('/noMember/order/info/validation','#nonCustOrderForm', fnOrderInfoCallback)
 	});
 
 	var fnOrderInfoCallback = function (result) {
 		if (result.isFind) {
-			$('#nonCustOrderForm').submit();
+			cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);
 		} else {
-			mcxDialog.alert("입력하신 정보가 정확하지 않습니다. 다시 시도해주세요.");
+			mcxDialog.alert('입력하신 정보가 정확하지 않습니다. 다시 시도해주세요.');
 			return;
 		}
 	};

src/main/webapp/WEB-INF/views/web/customer/NonCustOrderConfirmFormWeb.html

@@ -26,7 +26,7 @@
 				<h4>비회원 주문 조회</h4>
 			</div>
 			<div class="cont_body">
-				<form id="nonCustOrderForm" class="form_wrap form_col_c form_full" role="form" action="/noMember/order/list/form" method="post">
+				<form id="nonCustOrderForm" class="form_wrap form_col_c form_full" role="form">
 					<div class="form_info">
 						<span class="ico_content_order"></span>
 						<p>
@@ -93,14 +93,14 @@
 		if (!gagajf.validation($('#nonCustOrderForm'))) {
 			return;
 		}
-		gagajf.ajaxFormSubmit("/noMember/order/info/validation",'#nonCustOrderForm', fnOrderInfoCallback)
+		gagajf.ajaxFormSubmit('/noMember/order/info/validation','#nonCustOrderForm', fnOrderInfoCallback)
 	});
 
 	var fnOrderInfoCallback = function (result) {
 		if (result.isFind) {
-			$('#nonCustOrderForm').submit();
+			cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);
 		} else {
-			mcxDialog.alert("입력하신 정보가 정확하지 않습니다. 다시 시도해주세요.");
+			mcxDialog.alert('입력하신 정보가 정확하지 않습니다. 다시 시도해주세요.');
 			return;
 		}
 	};