주문서 퍼블 수정

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

@@ -142,7 +142,6 @@ public class TsfOrderController extends TsfBaseController {
 	public ModelAndView orderForm(HttpServletRequest request, Order order) {
 		ModelAndView mav = new ModelAndView();
 
-		
 		// 1.1 referer 체크 (order/noMember)
 		String refererStr = "";
 		if (request.getHeader("referer") != null) {
@@ -165,7 +164,7 @@ public class TsfOrderController extends TsfBaseController {
 		// 선물받기여부
 		String giftPackYn = "N";
 		
-		// 1.3. 선물하기주문 체크 후 비 로그인 상태면 장바구니로 강제 이동
+		// 1.3. 선물하기주문 체크 후 비로그인 상태면 장바구니로 강제 이동
 		if (coreOrderService.getGiftOrderCheck(order) > 0) {
 			// 비 로그인 상태면 장바구니로 강제 이동
 			if (TsfSession.isLogin() == false) {
@@ -699,11 +698,21 @@ public class TsfOrderController extends TsfBaseController {
 		}
 		
 		// 2. TODO 로그인체크 후 정보 설정 자주사용하는 결제정보조회
+		String payMeans 	= "";
+		String pgGb 		= "";
+		
 		if (TsfSession.isLogin()) {
+			Order vo = coreOrderService.getCustPaymeans(order);
 			
+			if (vo != null) {
+				payMeans 	= vo.getPayMeans();
+				pgGb 		= vo.getPgGb();
+			}
 		}
 
 		ModelAndView mav = new ModelAndView();
+		mav.addObject("payMeans" 		, payMeans);				// 결제수단
+		mav.addObject("pgGb" 			, pgGb);					// PG구분
 		mav.addObject("order" 			, order);					// 파라미터
 		mav.addObject("isLogin"			, TsfSession.isLogin());	// 로그인여부
 		mav.setViewName(super.getDeviceViewName("order/OrderPaymentInfo"));

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

@@ -14,14 +14,16 @@
 					<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 th:id="|item${i.index}|" class="apply_item goodsCpn goodsCartCpn" th:value="${i.index}+1">
 										<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="brand" th:text="${goods.brandGroupNm}"></div>
 													<div class="name" th:text="${goods.goodsNm}"></div>
 													<div class="option" th:each="colorNm, index : ${goods.colorNmArr}" th:text="${colorNm}+'/'+${goods.optCd2Arr[index.index]}"></div>
 												</figcaption>

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

@@ -28,7 +28,7 @@
 							<div class="form_field">
 								<input id="chk-maxdisc" type="checkbox" checked>
 								<label for="chk-maxdisc">
-									<span>최대 할인혜택을 바로 적용하세요!</span>
+									<span>최대 할인혜택 바로 적용</span>
 									<br>
 									<span class="maxdisc_amount">(<em class="cpnDcAmt">0</em>원 할인)</span>
 								</label>

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

@@ -225,12 +225,12 @@
 												<dd><div><span class="orgGoodsSumAmt" th:text="${#numbers.formatInteger(orgGoodsSumAmt, 1, 'COMMA')}"></span>원</div></dd>
 											</div>
 											<div>
-												<dt>배송비</dt>
-												<dd><div><span class="delvSumAmt" th:text="${#numbers.formatInteger(sumDelvFee, 1, 'COMMA')}"></span>원</div></dd>
+												<dt>할인금액</dt>
+												<dd><div><span class="dcSumAmt"></span>원</div></dd>
 											</div>
 											<div>
-												<dt>할인금액</dt>
-												<dd><div><span class="dcSumAmt disc_amount"></span>원</div></dd>
+												<dt>배송비</dt>
+												<dd><div><span class="delvSumAmt" th:text="${#numbers.formatInteger(sumDelvFee, 1, 'COMMA')}"></span>원</div></dd>
 											</div>
 										</dl>
 									</td>
@@ -323,7 +323,6 @@
 								</div>
 							</div>
 						</div>
-						
 					</div>
 					
 					<div class="agree_payment">
@@ -331,14 +330,16 @@
 					</div>
 				</div>
 			</div>
-
+			
 			<!-- //결제 정보 -->
 			<div class="inner wide">
-				<div class="btn_group btn_group_flex">
-					<div>
-						<button type="button" class="btn btn_primary" id="btn_payment">
+				<div class="area_paybtn">
+					<div class="btn_group btn_group_flex">
+						<div>
+							<button type="button" id="btn_payment" class="btn btn_primary">
 							동의 후 <span class="total_price">0</span>원 결제하기
-						</button>
+							</button>
+						</div> <!-- 210406_ID추가 -->
 					</div>
 				</div>
 			</div>
@@ -911,7 +912,7 @@ var paymentInfoSet = function() {
 				$("#paymentInfo").css("display", "block");
 				$("#paymentInfo").html(result);
 				
-				var payTeyp = "";
+				var payType = "";
 
 				// 결제타입명칭 설정
 				$("#orderForm .area_paymethod .paymethod_box ul li").on("click", function(){
@@ -932,9 +933,9 @@ var paymentInfoSet = function() {
 					}
 					
 					if (delvCnt > 0) {
-						$("#orderForm .area_paymentinfo").show();
+						$("#orderForm .area_paymentinfo .paymentinfo").show();
 					} else {
-						$("#orderForm .area_paymentinfo").hide();
+						$("#orderForm .area_paymentinfo .paymentinfo").hide();
 					}
 				});
 				
@@ -945,7 +946,7 @@ var paymentInfoSet = function() {
 					if (payType == "실시간계좌이체" || payType == "무통장입금" ) {
 						if ($(this).is(":checked")) {
 							$("#orderForm .area_paymethod .agree_insurance").show();
-							$("#orderForm .area_paymentinfo").show();
+							$("#orderForm .area_paymentinfo .paymentinfo").show();
 							$("#orderForm .area_paymentinfo .agree1").show();
 						} else {
 							displayTemp = false;
@@ -958,9 +959,9 @@ var paymentInfoSet = function() {
 						$("#orderForm .area_paymentinfo .agree1").hide();
 						
 						if (delvCnt > 0) {
-							$("#orderForm .area_paymentinfo").show();
+							$("#orderForm .area_paymentinfo .paymentinfo").show();
 						} else {
-							$("#orderForm .area_paymentinfo").hide();
+							$("#orderForm .area_paymentinfo .paymentinfo").hide();
 						}
 					}
 				});
@@ -969,9 +970,9 @@ var paymentInfoSet = function() {
 				$("#orderForm .area_paymethod .agree_insurance").hide();
 				$("#orderForm .area_paymentinfo .agree1").hide();
 				if (delvCnt > 0) {
-					$("#orderForm .area_paymentinfo").show();
+					$("#orderForm .area_paymentinfo. paymentinfo").show();
 				} else {
-					$("#orderForm .area_paymentinfo").hide();
+					$("#orderForm .area_paymentinfo .paymentinfo").hide();
 				}
 				
 				// 결재하기
@@ -1969,7 +1970,7 @@ var custCpnApply = function(obj, idx, cpnType) {
 				$('#orderForm .'+payType).attr("disabled", false);
 			});
 		} else {
-			$("#orderForm input[name=rdi-paynormal]").attr("disabled", false);
+			//$("#orderForm input[name=rdi-paynormal]").attr("disabled", false);
 		}
 		
 		// 선택안함

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

@@ -64,7 +64,7 @@
 												</div>
 												<div class="info_box">
 													<div class="od_name">
-														<div class="brand"><span th:text="${goods.brandEnm} + ' ' + ${goods.brandKnm}"></span></div>
+														<div class="brand"><span th:text="${goods.brandGroupNm}"></span></div>
 														<div class="name" th:text="${goods.goodsNm}"></div>
 													</div>
 													<div class="od_opt" >

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

@@ -109,7 +109,9 @@
 
 
 <script th:inline="javascript">
-var dispYn = [[${order.dispYn}]]; // 노출여부
+var dispYn 		= [[${order.dispYn}]]; 	// 노출여부
+var payMeans 	= [[${payMeans}]]; 		// 결제타입
+var pgGb 		= [[${pgGb}]]; 			// PG구분
 
 //화면노출
 var paymentInfoDispYn = function(temp) {
@@ -124,8 +126,46 @@ var paymentInfoDispYn = function(temp) {
 
 //컨텐츠 호출
 $(document).ready( function() {
+	
 	// 화면펼침
-	paymentInfoDispYn(dispYn);
+	if (pgGb == null || pgGb == "") {
+		paymentInfoDispYn("Y");
+	} else {
+		paymentInfoDispYn(dispYn);
+	}
+
+	// 2021.05.26 자주쓰는결제타입설정
+	if (pgGb == "KCP") {
+		if (payMeans == "G014_30") {
+			$("#payCreditCard").attr("checked", true);
+			$("#orderForm .payTypeNm").text("신용카드");
+			$("#orderForm .area_paymethod .agree_insurance").hide();
+		} else if (payMeans == "G014_60") {
+			$("#payCellphone").attr("checked", true);
+			$("#orderForm .payTypeNm").text("휴대폰 결제");
+			$("#orderForm .area_paymethod .agree_insurance").hide();
+		} else if (payMeans == "G014_10") {
+			$("#payRealBank").attr("checked", true);
+			$("#orderForm .payTypeNm").text("실시간계좌이체");
+			$("#orderForm .area_paymethod .agree_insurance").show();
+		} else if (payMeans == "G014_20") {
+			$("#payVirtualBank").attr("checked", true);
+			$("#orderForm .payTypeNm").text("무통장입금");
+			$("#orderForm .area_paymethod .agree_insurance").show();
+		}
+	} else if (pgGb == "KAKAO") {
+		$("#payKakao").attr("checked", true);
+		$("#orderForm .payTypeNm").text("카카오페이 결제");
+		$("#orderForm .area_paymethod .agree_insurance").hide();
+	} else if (pgGb == "NAVER") {
+		$("#payNaver").attr("checked", true);
+		$("#orderForm .payTypeNm").text("네이버페이 결제");
+		$("#orderForm .area_paymethod .agree_insurance").hide();
+	} else if (pgGb == "PAYCO") {
+		$("#payPayco").attr("checked", true);
+		$("#orderForm .payTypeNm").text("페이코 결제");
+		$("#orderForm .area_paymethod .agree_insurance").hide();
+	}
 });
 
 

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

@@ -24,7 +24,7 @@
 												</span>
 												
 												<figcaption>
-													<div class="brand" th:text="${goods.brandEnm}+' '+${goods.brandKnm}"></div>
+													<div class="brand" th:text="${goods.brandGroupNm}"></div>
 													<div class="name" th:text="${goods.goodsNm}"></div>
 													<div class="option" th:each="colorNm, index : ${goods.colorNmArr}" th:text="${colorNm}+'/'+${goods.optCd2Arr[index.index]}"></div>
 												</figcaption>

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

@@ -923,7 +923,7 @@ var paymentInfoSet = function() {
 				$("#paymentInfo").css("display", "block");
 				$("#paymentInfo").html(result);
 				
-				var payTeyp = "";
+				var payType = "";
 				
 				// 결제타입명칭 설정
 				$("#orderForm .area_paymethod .paymethod_box ul li").on("click", function(){
@@ -940,7 +940,7 @@ var paymentInfoSet = function() {
 					if (payType == "실시간계좌이체" || payType == "무통장입금" ) {
 						$("#orderForm .area_paymethod .agree_insurance").show();
 					} else {
-						$("#orderForm .area_paymethod .agree_insurance").hide();	
+						$("#orderForm .area_paymethod .agree_insurance").hide();
 					}
 					
 					if (delvCnt > 0) {
@@ -978,7 +978,6 @@ var paymentInfoSet = function() {
 				});
 
 				// 2021.05.16 초기값설정
-				$("#orderForm .area_paymethod .agree_insurance").hide();
 				$("#orderForm .area_paymentinfo .agree1").hide();
 				if (delvCnt > 0) {
 					$("#orderForm .area_paymentinfo").show();
@@ -1879,7 +1878,7 @@ var custCpnApply = function(obj) {
 				$('#orderForm .'+payType).attr("disabled", false);
 			});
 		} else {
-			$("#orderForm input[name=rdi-paynormal]").attr("disabled", false);
+			//$("#orderForm input[name=rdi-paynormal]").attr("disabled", false);
 		}
 		
 		// 2021.04.25 실시간계좌이체, 무통장입금시 보증보험 신청 약관 노출 감추는기능

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

@@ -50,7 +50,7 @@
 									<img th:src="${imageUrl + '/' + goods.sysImgNm}" src="/" width="100%" alt="">
 								</span>
 								<figcaption>
-									<div class="brand" th:text="${goods.brandEnm} + ' ' + ${goods.brandKnm}"></div>
+									<div class="brand" th:text="${goods.brandGroupNm}"></div>
 									<div class="name" th:text="${goods.goodsNm}"></div>									
 									<div class="option" th:each="colorNm, index : ${goods.colorNmArr}">
 										<span th:text="${colorNm}+'/'+${goods.optCd2Arr[index.index]}"></span> 

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

@@ -107,7 +107,9 @@
 
 
 <script th:inline="javascript">
-var dispYn = [[${order.dispYn}]]; // 노출여부
+var dispYn 		= [[${order.dispYn}]]; 	// 노출여부
+var payMeans 	= [[${payMeans}]]; 		// 결제타입
+var pgGb 		= [[${pgGb}]]; 			// PG구분
 
 //화면노출
 var paymentInfoDispYn = function(temp) {
@@ -123,7 +125,44 @@ var paymentInfoDispYn = function(temp) {
 //컨텐츠 호출
 $(document).ready( function() {
 	// 화면펼침
-	paymentInfoDispYn(dispYn);
+	if (pgGb == null || pgGb == '') {
+		paymentInfoDispYn("Y");
+	} else {
+		paymentInfoDispYn(dispYn);
+	}
+	
+	// 2021.05.26 자주쓰는결제타입설정
+	if (pgGb == "KCP") {
+		if (payMeans == "G014_30") {
+			$("#payCreditCard").attr("checked", true);
+			$("#orderForm .payTypeNm").text("신용카드");
+			$("#orderForm .area_paymethod .agree_insurance").hide();
+		} else if (payMeans == "G014_60") {
+			$("#payCellphone").attr("checked", true);
+			$("#orderForm .payTypeNm").text("휴대폰 결제");
+			$("#orderForm .area_paymethod .agree_insurance").hide();
+		} else if (payMeans == "G014_10") {
+			$("#payRealBank").attr("checked", true);
+			$("#orderForm .payTypeNm").text("실시간계좌이체");
+			$("#orderForm .area_paymethod .agree_insurance").show();
+		} else if (payMeans == "G014_20") {
+			$("#payVirtualBank").attr("checked", true);
+			$("#orderForm .payTypeNm").text("무통장입금");
+			$("#orderForm .area_paymethod .agree_insurance").show();
+		}
+	} else if (pgGb == "KAKAO") {
+		$("#payKakao").attr("checked", true);
+		$("#orderForm .payTypeNm").text("카카오페이 결제");
+		$("#orderForm .area_paymethod .agree_insurance").hide();
+	} else if (pgGb == "NAVER") {
+		$("#payNaver").attr("checked", true);
+		$("#orderForm .payTypeNm").text("네이버페이 결제");
+		$("#orderForm .area_paymethod .agree_insurance").hide();
+	} else if (pgGb == "PAYCO") {
+		$("#payPayco").attr("checked", true);
+		$("#orderForm .payTypeNm").text("페이코 결제");
+		$("#orderForm .area_paymethod .agree_insurance").hide();
+	}
 });