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

src/main/java/com/style24/front/biz/dao/TsfOrderDao.java

@@ -146,4 +146,14 @@ public interface TsfOrderDao {
 	 * @since 2021. 05. 10
 	 */
 	Collection<Order> getGoodsInfoForInsurance(Order order);
+
+	/**
+	 * 비회원 주문 여부 정보 조회
+	 *
+	 * @param Order
+	 * @return int
+	 * @author card007
+	 * @since 2021. 05. 26
+	 */
+	int getNoMemberOrderInfo(Order order);
 }

src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -6,14 +6,17 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
 
 import javax.net.ssl.HttpsURLConnection;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.style24.persistence.domain.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -35,6 +38,16 @@ import com.style24.front.biz.dao.TsfGoodsDao;
 import com.style24.front.biz.dao.TsfOrderDao;
 import com.style24.front.biz.dao.TsfRendererDao;
 import com.style24.front.support.security.session.TsfSession;
+import com.style24.persistence.domain.Cart;
+import com.style24.persistence.domain.Coupon;
+import com.style24.persistence.domain.Delivery;
+import com.style24.persistence.domain.GiftCard;
+import com.style24.persistence.domain.Goods;
+import com.style24.persistence.domain.GoodsStock;
+import com.style24.persistence.domain.KakaoPay;
+import com.style24.persistence.domain.NaverPay;
+import com.style24.persistence.domain.Order;
+import com.style24.persistence.domain.Payment;
 import com.usafe.guarantee.InsuranceInfo;
 import com.usafe.guarantee.InsuranceManager;
 
@@ -2071,4 +2084,16 @@ public class TsfOrderService {
 
 		return "SUCCESS";
 	}
+
+	/**
+	 * 비회원 주문 여부 정보 조회
+	 *
+	 * @param Order
+	 * @return int
+	 * @author card007
+	 * @since 2021. 05. 26
+	 */
+	public int getNoMemberOrderInfo(Order order) {
+		return orderDao.getNoMemberOrderInfo(order);
+	}
 }

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

@@ -310,7 +310,7 @@ public class TsfNoMemberController extends TsfBaseController {
 		if (!order.getOrdPhnno().contains("-")) {
 			order.setOrdPhnno(order.getOrdPhnno().replaceAll("(\\d{3})(\\d{3,4})(\\d{4})", "$1-$2-$3"));
 		}
-		boolean isFind = orderService.getPagingOrdNoListCount(order) > 0;
+		boolean isFind = orderService.getNoMemberOrderInfo(order) > 0;
 
 		if (isFind) {
 			TsfSession.setAttribute("noMemberOrdNm",order.getOrdNm());
@@ -349,10 +349,10 @@ public class TsfNoMemberController extends TsfBaseController {
 		}
 
 		// 2. 환불 사전 정보 조회
-		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo(orderChange);
+		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo2(orderChange);
 		List<Order> cnclReqList = (List<Order>)refundPreInfo.get("cnclReqList");
 
-		return coreOrderRefundService.cnclRtnRefundAmt(cnclReqList);
+		return coreOrderRefundService.cnclRtnRefundAmt2(cnclReqList);
 	}
 
 	/**
@@ -552,7 +552,8 @@ public class TsfNoMemberController extends TsfBaseController {
 
 		// 1. 취소완료 처리
 		orderChange.setCustNo(0);
-		GagaMap result = coreOrderChangeService.orderCancelPreInfo(orderChange, 0);
+		// GagaMap result = coreOrderChangeService.orderCancelPreInfo(orderChange, 0);
+		GagaMap result = coreOrderChangeService.orderCancelPreInfoTemp(orderChange, 0);
 
 		// TODO
 		// 취소 완료 알림톡 발송 에정

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/java/com/style24/persistence/mybatis/shop/TsfOrder.xml

@@ -608,6 +608,15 @@
 		AND    INS.ORD_NO = #{ordNo}
 	</select>
 	
+	<!-- 비회원 주문 여부 정보 조회 -->
+	<select id="getNoMemberOrderInfo" parameterType="Order" resultType="int">
+		/* TsfOrder.getNoMemberOrderInfo */
+		SELECT COUNT(*)
+		  FROM TB_ORDER
+		 WHERE ORD_NO = #{ordNo}
+		   AND ORD_NM = #{ordNm}
+		   AND ORD_PHNNO = #{ordPhnno}
+	</select>
 
 
 </mapper>

src/main/webapp/WEB-INF/views/mob/cart/CartListAjaxFormMob.html

@@ -507,9 +507,9 @@
 		<div class="inner wide">
 			<div class="od_recommend">
 				<h3>추천상품</h3>
-				<div class="swiper-container item_list">
-					<div class="swiper-wrapper">
-						<div class="swiper-slide">
+				<div class="swiper-container item_list swiper-container-initialized swiper-container-horizontal swiper-container-android">
+					<div class="swiper-wrapper" style="transform: translate3d(0px, 0px, 0px);">
+						<div class="swiper-slide swiper-slide-active" style="width: 176px; margin-right: 8px;">
 							<div class="item_prod"> <!-- item_prod ranker d_detail -->
 								<div class="item_state"> <!-- item_state AD soldout -->
 									<button type="button" class="itemLike">관심상품 추가</button>
@@ -537,7 +537,7 @@
 								</div>
 							</div>
 						</div>
-						<div class="swiper-slide">
+						<div class="swiper-slide swiper-slide-next" style="width: 176px; margin-right: 8px;">
 							<div class="item_prod"> <!-- item_prod ranker d_detail -->
 								<div class="item_state"> <!-- item_state AD soldout -->
 									<button type="button" class="itemLike">관심상품 추가</button>
@@ -565,7 +565,7 @@
 								</div>
 							</div>
 						</div>
-						<div class="swiper-slide">
+						<div class="swiper-slide" style="width: 176px; margin-right: 8px;">
 							<div class="item_prod"> <!-- item_prod ranker d_detail -->
 								<div class="item_state"> <!-- item_state AD soldout -->
 									<button type="button" class="itemLike">관심상품 추가</button>
@@ -593,7 +593,7 @@
 								</div>
 							</div>
 						</div>
-						<div class="swiper-slide">
+						<div class="swiper-slide" style="width: 176px; margin-right: 8px;">
 							<div class="item_prod"> <!-- item_prod ranker d_detail -->
 								<div class="item_state"> <!-- item_state AD soldout -->
 									<button type="button" class="itemLike">관심상품 추가</button>
@@ -621,7 +621,7 @@
 								</div>
 							</div>
 						</div>
-						<div class="swiper-slide">
+						<div class="swiper-slide" style="width: 176px; margin-right: 8px;">
 							<div class="item_prod"> <!-- item_prod ranker d_detail -->
 								<div class="item_state"> <!-- item_state AD soldout -->
 									<button type="button" class="itemLike">관심상품 추가</button>
@@ -650,7 +650,7 @@
 							</div>
 						</div>
 					</div>
-				</div>
+					<span class="swiper-notification" aria-live="assertive" aria-atomic="true"></span></div>
 			</div>
 			<div class="od_calc_wrap" id="bottomOrderArea">
 				<button type="button" class="btn btn_dark"><span>합계 <em class="realOrderAmtText" th:text="${#numbers.formatInteger(order.sumRealPayAmt + order.totDelvFee, 1, 'COMMA')}">0</em>원</span></button>
@@ -713,6 +713,12 @@
 			};
 
 			$(document).ready(function() {
+				var od_recommend_slide = new Swiper('.od_recommend .swiper-container', {
+					slidesPerView: 2,
+					spaceBetween: 8,
+					centerMode: true,
+				});
+
 				setLoginInfo();
 
 				if([[${!order.shotCanYn.equals('Y')}]]) {

src/main/webapp/WEB-INF/views/mob/goods/GoodsDealDetailFormMob.html

@@ -208,10 +208,10 @@
 										</div>
 									</div>
 									<div class="form_wrap">
-										<div class="form_field mb20" id="form_field_item_Up">
+										<div class="form_field mb10" id="form_field_item_Up">
 											<div class="select_custom deal_opt_item"> <!-- active -->
 												<div class="combo">
-													<div class="select">상품선택</div>
+													<div class="select">선택</div>
 													<ul class="list">
 														<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true" / 품절표기 data-soldout="true" 추가  -->
 														<li th:each="goodsInfo, status : ${goodsDealComposeList}" 
@@ -224,7 +224,6 @@
 																		<div class="itemPic">
 																			<img alt="" class="vLHTC pd_img" th:src="${imgGoodsUrl+'/'+goodsInfo.sysImgNm+'?RS=44'}" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 																		</div>
-																		<p class="itemBrand" th:text="${goodsInfo.brandGroupNm}">BRAND NAME1</p>
 																		<div class="itemName" ><span class="tit_option" th:text="${'[상품'+status.count+']'}">[상품1]</span><th:block th:text="${goodsInfo.goodsFullNm}"></th:block></div>
 																		<p class="itemPrice">
 																			<span class="itemPrice_original" th:if="${goodsInfo.listPrice > goodsInfo.currPrice}" th:text="${#numbers.formatInteger(goodsInfo.listPrice, 0,'COMMA')}">89,000</span>
@@ -243,7 +242,7 @@
 										<div class="form_field" id="form_field1_Up">
 											<div class="select_custom item_opt1" disabled>
 												<div class="combo">
-													<div class="select">옵션1선택</div>
+													<div class="select">선택</div>
 													<ul class="list" id="goodsDealOptUp1">
 														<!--  옵션 1 -->
 													</ul>
@@ -253,7 +252,7 @@
 										<div class="form_field"  id="form_field2_Up">
 											<div class="select_custom item_opt2" disabled>
 												<div class="combo">
-													<div class="select">옵션2선택</div>
+													<div class="select">선택</div>
 													<ul class="list" id="goodsDealOptUp2">
 														<!--  옵션 2 -->
 													</ul>
@@ -848,7 +847,7 @@
 	}
 	
 	//팝업 - 딜상세팝업 구매하기버튼 > 옵션셀렉트팝업	
-	var fnGoodsDealOptionOpen = function(goodsCd){
+	var fnGoodsDealSaleOpen = function(goodsCd){
 		$("#pdDescrpPop .close-modal ").click();
 		$('.container').addClass('btPop_open');
 		$(".Purchase_pop .pop_option_select").show();
@@ -865,6 +864,23 @@
         return false;
 	}	
 	
+	//팝업 - 딜상세정보 옵션선택 > 옵션셀렉트팝업
+	var fnGoodsDealOptionOpen = function(goodsCd){
+		$('.container').addClass('btPop_open');
+		$(".Purchase_pop .pop_option_select").show();
+		popOpenScroll();
+		let selIdx = 0;
+		$('.Purchase_pop .pop_option_select').find('#form_field_item_Up .list li').each(function() { 
+			if (goodsCd == $(this).find('.item_prod').attr('goodscd')){
+				return false;
+			}
+			selIdx ++;
+		});
+		
+		$('.Purchase_pop .pop_option_select').find('#form_field_item_Up .list li').eq(selIdx).trigger("click");
+        return false;
+	}	
+	
 	// pop open
 	function popOpenScroll(){
 		$('html, body').css({'overflow': 'hidden', 'height': '100%'}); 
@@ -1140,15 +1156,15 @@
 			 $(".Purchase_pop .pop_option_select").hide();
 			 return false;
 		 })
-			//팝업 - 딜상세정보 옵션선택 > 옵션셀렉트팝업
-		$(document).on('click','.pd_dealitem .item_prod .btn_default',function(e){
-				$('.container').addClass('btPop_open');
-				$(".Purchase_pop .pop_option_select").show();
-				popOpenScroll();
-			 return false;
-		 });
+//			//팝업 - 딜상세정보 옵션선택 > 옵션셀렉트팝업 ==> fnGoodsDealOptionOpen()대체
+//		$(document).on('click','.pd_dealitem .item_prod .btn_default',function(e){
+//				$('.container').addClass('btPop_open');
+//				$(".Purchase_pop .pop_option_select").show();
+//				popOpenScroll();
+//			 return false;
+//		 });
 
-		//팝업 - 딜상세팝업 구매하기버튼 > 옵션셀렉트팝업  ==> fnGoodsDealOptionOpen()대체
+		//팝업 - 딜상세팝업 구매하기버튼 > 옵션셀렉트팝업  ==> fnGoodsDealSaleOpen()대체
 //		$(document).on('click','#pdDescrpPop .modal-footer button',function(e){
 //			$("#pdDescrpPop .close-modal ").click();
 //			$('.container').addClass('btPop_open');

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailReviewFormMob.html

@@ -672,11 +672,16 @@
 			tag += '			<dl>\n';
 			tag += '				<div>\n';
 			tag += '					<dt>구매옵션</dt>\n';
+			tag += '					<dd>\n';
 			if (item.goodsOptionList != null && item.goodsOptionList.length > 0){
 				$.each(item.goodsOptionList, function(gIdx, goodsOption){
-			tag += '					<dd>'+ goodsOption.optCd1 +' / '+ goodsOption.optCd2 +'</dd>\n';		
+			tag += '					'+ goodsOption.optCd1Nm +' / '+ goodsOption.optCd2;
+				if (item.goodsOptionList.length != (gIdx+1)){
+			tag += '					,';
+				}
 				});
 			}
+			tag += '					</dd>\n';
 			tag += '				</div>\n';
 			tag += '				<div>\n';
 			tag += '					<dt>키/몸무게</dt>\n';

src/main/webapp/WEB-INF/views/mob/goods/GoodsIncludeFormMob.html

@@ -61,7 +61,7 @@
 								<span class="itemPercent" th:if="${goodsInfo.dcRate > 0}" th:text="|${#numbers.formatDecimal(goodsInfo.dcRate,0,0)}%|">10%</span>
 							</p>
 						</a>
-					<button type="button" class="btn btn_default">옵션 선택</button>
+						<button type="button" class="btn btn_default" th:onclick="fnGoodsDealOptionOpen([[${goodsInfo.compsGoodsCd}]])">옵션 선택</button>
 					</div>
 				</div>
 			</div>
@@ -444,10 +444,10 @@
 	//팝업 - 딜상세팝업 구매하기버튼
 	$(document).on('click','#btn_deal_purchase',function(e){
 		let selGoodsCd = $('#pdDescrpPop').find('input[name=selectGoods]').val();
-		fnGoodsDealOptionOpen(selGoodsCd);
+		fnGoodsDealSaleOpen(selGoodsCd);
 	});
 	
-	
+
 	$(document).ready( function() {
 		
 	});

src/main/webapp/WEB-INF/views/mob/goods/GoodsQnaDetailFormMob.html

@@ -33,10 +33,10 @@
 				<div class="form_field">
 					<div class="input_box">
 						<div class="input_wrap">
-							<textarea name="questContent" cols="30" rows="10"  maxlength="500" placeholder="문의내용 입력(500자 이내)" style="resize: none;"></textarea>
+							<textarea id="exchange2" name="questContent" maxlength="500" style="resize: none;" placeholder="내용을 입력해 주세요 (필수)"></textarea>
 							<p class="txt_cnt">
-								<span id="itemqna_cnt" class="itemqna_cnt" ><em class="c_primary">0</em>/500자</span>
-							</p>   
+								<span id="exchange2-counter" class="c_primary">12</span> / 500
+							</p>
 						</div>           
 						<div class="secret_box">
 							<input id="wr_secret" type="checkbox" name="secretYn" value="Y"><label for="wr_secret"><span>비밀글설정</span></label>
@@ -74,18 +74,18 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 
-	// 상품문의 작성 > 글자수 체크
-	$('.pd_qnawrite_pop .doc_itemqna').keyup(function (e){
-		let contentQna = $(this).val();
-		$('.itemqna_cnt').html("(<em class='c_primary'>"+contentQna.length+"</em>/500자)");
-		
-		if (contentQna.length > 500){
-			$(this).val(contentQna.substring(0, 500));
-			$('.itemqna_cnt').html("(<em class='c_primary'>500</em>/500자)");
-			//mcxDialog.alert("최대 500자까지 입력 가능합니다.");
-			return false;
-		}
+	$('#exchange2').keyup(function (e){
+		var content = $(this).val();
+		$('#exchange2-counter').html(content.length);
 	});
+	$('#exchange2').keyup();
+
+	$('#exchange2').focus(function(){
+		$(this).parent('.input_wrap').css('outline', '1px auto rgb(229, 151, 0)');
+	})
+	$('#exchange2').blur(function(){
+		$(this).parent('.input_wrap').css('outline', 'none');
+	})
 	
 	// 저장
 	var fnGoodsQnaSave = function() {

src/main/webapp/WEB-INF/views/mob/goods/GoodsReviewDetailFormMob.html

@@ -81,9 +81,12 @@
 													<dl>
 														<div th:if="${review.goodsOptionList != null and !review.goodsOptionList.empty}" >
 															<dt >구매옵션</dt>
+															<dd> 
 															<th:block th:each="reviewGoods, goodsStatus : ${review.goodsOptionList}">
-															<dd th:text="${reviewGoods.optCd1Nm +' / '+ reviewGoods.optCd2}">베이지 / 100</dd>
+															<th:block th:text="${reviewGoods.optCd1Nm +' / '+ reviewGoods.optCd2}">베이지 / 100</th:block>
+															<th:block th:if="${not goodsStatus.last}" th:text="${','}"></th:block>
 															</th:block>
+															</dd>
 														</div>
 														<div>
 															<dt>키/몸무게</dt>

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreCancelDetailFormMob.html

@@ -211,6 +211,7 @@
 let oneData = [[${oneData}]];
 var isLogin = [[${isLogin}]];
 let kcpReceiptUrl = [[${kcpReceiptUrl}]];
+let refundYn = [[${refundYn}]];
 
 $(document).ready(function() {
 	// 타이틀명

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberOrderDetailFormMob.html

@@ -774,7 +774,7 @@
 		let jsonData = JSON.stringify(data);
 
 		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-			cfnGoToPage(_PAGE_MYPAGE_ORDER_DETAIL + ordNo);
+			cfnGoToPage(_PAGE_NOMEMBER_ORDER_DETAIL);
 		});
 	}
 </script>

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();
+	}
 });
 
 

src/main/webapp/biz/mypage.js

@@ -242,7 +242,7 @@ var fnDeleteOrder = function(noMember) {
 
 			gagajf.ajaxJsonSubmit(url, jsonData, function() {
 				if (noMember == 'noMember') {
-					cfnGoToPage(_PAGE_NOMEMBER_MAIN);
+					cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);
 				} else {
 					cfnGoToPage(_PAGE_MYPAGE);
 				}