Merge branch 'develop' into bin2107

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

@@ -591,6 +591,10 @@ public class TsfDisplayService {
 					cate.setFrontGb(data.getFrontGb());
 					cate.setBrandGroupNo(Integer.parseInt(data.getBrandGroupNo()));
 					cate.setMaxRow(maxrow - goodsList.size());
+					
+					// 2021.09.29 신상품조회시 frontGb, custGb 누락 추가
+					cate.setCustGb(TsfSession.getCustGb());
+					
 					goodsList.addAll(goodsDao.getContentsCategoryNewGoodsList(cate));
 				}
 			}
@@ -641,6 +645,10 @@ public class TsfDisplayService {
 					cate.setFrontGb(data.getFrontGb());
 					cate.setBrandGroupNo(Integer.parseInt(data.getBrandGroupNo()));
 					cate.setMaxRow(maxrow - goodsList.size());
+					
+					// 2021.09.29 신상품조회시 frontGb, custGb 누락 추가
+					cate.setFrontGb(TsfSession.getFrontGb());
+					cate.setCustGb(TsfSession.getCustGb());
 					goodsList.addAll(goodsDao.getContentsCategoryNewGoodsList(cate));
 				}
 			}
@@ -1101,6 +1109,11 @@ public class TsfDisplayService {
 			tempCate.setCustNo(TsfSession.isLogin() ? TsfSession.getInfo().getCustNo() : 0);
 			tempCate.setSiteCd(data.getSiteCd());
 			tempCate.setCateGb(data.getCateGb());
+			
+			// 2021.09.29 신상품조회시 frontGb, custGb 누락 추가
+			tempCate.setFrontGb(TsfSession.getFrontGb());
+			tempCate.setCustGb(TsfSession.getCustGb());
+			
 			data.setGoodsList(goodsDao.getContentsCategoryNewGoodsList(tempCate));
 		}
 

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

@@ -648,7 +648,12 @@ public class TsfDisplayController extends TsfBaseController {
 						tempCate.setSiteCd(data.getSiteCd());
 						tempCate.setCateGb(data.getCateGb());
 						tempCate.setCate1No(data.getCateNo());
+						
+						// 2021.09.29 신상품조회시 frontGb, custGb 누락 추가
+						tempCate.setFrontGb(TsfSession.getFrontGb());
+						tempCate.setCustGb(TsfSession.getCustGb());
 					}
+					// 
 					mav.addObject("newGoodsList", displayService.getContentsCategoryNewGoodsList(tempCate));
 				}
 			} else if ("SCM003".equals(cateMain.getContentsLoc())) {

src/main/webapp/WEB-INF/views/mob/display/BestMainFormMob.html

@@ -324,6 +324,9 @@
 					tag += '				<img alt="BLUE-a" class=" vLHTC pd_img" src="' + _uploadGoodsUrl + '/' + item.sysImgNm + '">\n';
 					tag += '			</div>\n';
 					tag += '			<p class="itemBrand">'+item.brandGroupNm+'</p>\n';
+					if (item.goodsTnm != null && item.goodsTnm != '') {
+						tag+='					<div class="itemComment">'+item.goodsTnm+'</div>\n';
+					}
 					tag += '			<div class="itemName">'+item.goodsFullNm+'</div>\n';
 					tag += '			<p class="itemPrice">';
 					if (item.currPrice != item.listPrice) {
@@ -370,9 +373,7 @@
 						}
 						tag += '	</p>';
 					}
-					if (item.goodsTnm != null && item.goodsTnm != '') {
-						tag+='					<div class="itemComment">'+item.goodsTnm+'</div>\n';
-					}
+					
 					tag += '		</a>\n';
 					tag += '	</div>\n';
 					tag += '</div>\n';

src/main/webapp/WEB-INF/views/mob/display/BrandMainFormMob.html

@@ -183,8 +183,8 @@
 																<img class="vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + goodsData.sysImgNm.replace('https:', '').replace('//image.istyle24.com/Upload/ProductImage/','')}" onerror="noneImg(this)">
 															</div>
 															<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
-															<div class="itemName"th:text="${goodsData.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
 															<div class="itemComment" th:if="${not #strings.isEmpty(goodsData.goodsTnm)}" th:text="${goodsData.goodsTnm}">#가을 느낌 물씬!!</div>
+															<div class="itemName"th:text="${goodsData.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
 															<p th:unless="${goodsData.goodsType=='G056_D'}" class="itemPrice">
 																<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 																[[${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')}]]
@@ -272,8 +272,8 @@
 																<img class="vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + goodsData.sysImgNm.replace('https:', '').replace('//image.istyle24.com/Upload/ProductImage/','')}" onerror="noneImg(this)">
 															</div>
 															<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
-															<div class="itemName" th:text="${goodsData.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
 															<div class="itemComment" th:if="${not #strings.isEmpty(goodsData.goodsTnm)}" th:text="${goodsData.goodsTnm}">#가을 느낌 물씬!!</div>
+															<div class="itemName" th:text="${goodsData.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
 															<p th:unless="${goodsData.goodsType=='G056_D'}" class="itemPrice">
 																<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 																[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
@@ -373,8 +373,8 @@
 												<img class="vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + goodsData.sysImgNm}" onerror="noneImg(this)">
 											</div>
 											<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
-											<div class="itemName" th:text="${goodsData.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
 											<div class="itemComment" th:if="${not #strings.isEmpty(goodsData.goodsTnm)}" th:text="${goodsData.goodsTnm}">#주문 폭주 상품</div>
+											<div class="itemName" th:text="${goodsData.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
 											<p th:unless="${goodsData.goodsType=='G056_D'}" class="itemPrice">
 												<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 												[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]

src/main/webapp/WEB-INF/views/mob/display/CategoryMainFormMob.html

@@ -119,8 +119,8 @@
 													<img alt="BLUE-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + item.sysImgNm.replace('https:', '').replace('//image.istyle24.com/Upload/ProductImage/','')}" onerror="noneImg(this)">
 												</div>
 												<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
-												<div class=" itemName" th:text="${item.goodsFullNm}">여성 체인 프린트 큐롯 스커트 프린트 큐롯 스커트</div>
 												<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
+												<div class="itemName" th:text="${item.goodsFullNm}">여성 체인 프린트 큐롯 스커트 프린트 큐롯 스커트</div>
 												<p th:unless="${item.goodsType=='G056_D'}" class="itemPrice"><span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>[[${#numbers.formatInteger(item.currPrice,1,'COMMA')}]]
 													<span class=" itemPercent" th:if="${item.currPrice != item.listPrice}" th:text="${(item.listPrice == 0 ? 0 : #numbers.formatDecimal((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 												</p>

src/main/webapp/WEB-INF/views/mob/display/CategoryMainFormMob4.html

@@ -79,8 +79,8 @@
 														<button type="button" class="itemLike" th:classappend="${item.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${item.goodsCd}, goodsNm=${item.goodsFullNm}, ithrCd='', contentsLoc='SCM001', planDtlSq=''">관심상품 추가</button>
 													</div>
 													<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
-													<div class="itemName" th:text="${item.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
 													<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
+													<div class="itemName" th:text="${item.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
 													<p class="itemPrice" th:text="${#numbers.formatInteger(item.currPrice,3,'COMMA')}">80,100</p>
 												</a>
 											</div>
@@ -111,8 +111,8 @@
 													<button type="button" class="itemLike" th:classappend="${item.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${item.goodsCd}, goodsNm=${item.goodsFullNm}, ithrCd='', contentsLoc='SCM002', planDtlSq=''">관심상품 추가</button>
 												</div>
 												<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
-												<div class=" itemName" th:text="${item.goodsFullNm}">여성 체인 프린트 큐롯 스커트 프린트 큐롯 스커트</div>
 												<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
+												<div class="itemName" th:text="${item.goodsFullNm}">여성 체인 프린트 큐롯 스커트 프린트 큐롯 스커트</div>
 												<p class="itemPrice"><span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>[[${#numbers.formatInteger(item.currPrice,1,'COMMA')}]]
 													<span class=" itemPercent" th:if="${item.currPrice != item.listPrice}" th:text="${(item.listPrice == 0 ? 0 : #numbers.formatDecimal((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 												</p>

src/main/webapp/WEB-INF/views/mob/display/OutletMainFormMob.html

@@ -75,6 +75,7 @@
 														<img class="vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + item.sysImgNm.replace('https:', '').replace('//image.istyle24.com/Upload/ProductImage/','')}" alt="">
 													</div>
 													<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
+													<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
 													<div class="itemName" th:text="${item.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
 													<p th:unless="${item.goodsType=='G056_D'}" class="itemPrice">
 														<span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>
@@ -84,7 +85,7 @@
 													<p th:if="${item.goodsType=='G056_D'}" class="itemPrice">
 														[[${#numbers.formatInteger(item.currPrice,0,'COMMA')} + ' ~']]
 													</p>
-													<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
+													
 												</a>
 											</div>
 										</div>
@@ -114,6 +115,7 @@
 													<img class="vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + item.sysImgNm.replace('https:', '').replace('//image.istyle24.com/Upload/ProductImage/','')}" alt="">
 												</div>
 												<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
+												<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
 												<div class="itemName" th:text="${item.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
 												<p th:unless="${item.goodsType=='G056_D'}" class="itemPrice"><span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>[[${#numbers.formatInteger(item.currPrice,0,'COMMA')}]]
 													<span class="itemPercent" th:if="${item.currPrice != item.listPrice}" th:text="${(item.listPrice == 0 ? 0 : #numbers.formatDecimal((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
@@ -130,7 +132,6 @@
 														<span class="badge13" th:if="${idx.index<3}" th:value="${iconArray[0]}" th:text="${iconArray[1]}"></span>
 													</th:block>
 												</p>
-												<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
 											</a>
 										</div>
 									</div>

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

@@ -517,7 +517,7 @@ $("#btn_delivery_addr_save").on("click", function(){
 		return false;
 	}
 	
-	var recipPhnno = fnPhnnoSet($("#deliveryModifyForm input[name=recipPhnno]").val());
+	var recipPhnno = fnPhnnoSet($("#orderGiftForm input[name=recipPhnno]").val());
 	
 	// 변수값 설정
 	var jsonObj = {

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

@@ -60,7 +60,7 @@
 								<div class="form_field">
 									<div class="tab_cont active">
 										<div class="input_wrap">
-											<input type="number" name="recipNm" class="form_control" value="" maxlength="10" placeholder="받는 분" style="ime-mode:active">
+											<input type="text" name="recipNm" class="form_control" value="" maxlength="10" placeholder="받는 분" style="ime-mode:active">
 										</div>
 										<div class="form_field">
 											<div class="input_wrap">

src/main/webapp/WEB-INF/views/mob/planning/PlanningShotGuideFormMob.html

@@ -187,6 +187,9 @@ if(shotBrandList.length>0){
 			html += '								<img class="vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item2.sysImgNm +'">';
 			html += '							</div>';
 			html += '							<p class="itemBrand">'+item2.brandNm+'</p>';
+			if(item2.goodsTnm != null){
+				html += '						<div class="itemComment">'+item2.goodsTnm+'</div>';
+			}
 			html += '							<div class="itemName">'+item2.goodsNm+'</div>';
 			html += '							<p class="itemPrice">';
 			if (item2.currPrice != item2.listPrice) {
@@ -233,9 +236,7 @@ if(shotBrandList.length>0){
 				}
 				html += '	</p>';
 			}
-			if(item2.goodsTnm != null){
-				html += '			<div class="itemComment">'+item2.goodsTnm+'</div>';
-			}
+			
 			html += '						</a>';
 			html += '					</div>';
 			html += '				</div>';

src/main/webapp/WEB-INF/views/mob/social/SocialMainFormMob.html

@@ -140,6 +140,9 @@ let fnGetSocialList = function(result) {
 		html += '				<img class="vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'">';
 		html += '			</div>';
 		html += '			<p class="itemBrand">'+item.brandGroupNm+'</p>';
+		if(item.goodsTnm != null){
+			html += '           <div class="itemComment">'+item.goodsTnm+'</div>';
+		}
 		html += '			<div class="itemName">'+item.goodsNm+'</div>';
 		html += '			<p class="itemPrice">';
 		if (item.currPrice != item.listPrice) {
@@ -150,9 +153,6 @@ let fnGetSocialList = function(result) {
 			html += '                <span class=" itemPercent">'+item.dcRate.addComma()+'%</span>';
 		}
 		html += '			</p>';
-		if(item.goodsTnm != null){
-			html += '           <div class="itemComment">'+item.goodsTnm+'</div>';
-		}
 		
 		html += '		</a>';
 		html += '			<div class="shopBag">';

src/main/webapp/WEB-INF/views/web/callcenter/OneToOneQnaRegisterFormWeb.html

@@ -58,6 +58,7 @@
 										<div class="ui_col_4 form_full"><!-- 210415 변경 : 필드 클래스 (ui_col_10 → ui_col_4) 변경  -->
 											<div class="select_custom">
 												<div class="combo"><!-- 210415 추가 : 텍스트 '필수' -->
+													<input type="hidden" name="counselClsf" id="counselClsf"/>
 													<div class="select">유형을 선택해 주세요 (필수)</div>
 													<ul class="list" id="ulCounselClsf">
 													</ul>
@@ -161,6 +162,8 @@
 	
 	// 문의유형 선택 시
 	var fnChangeCounselClsf = function(counselClsf) {
+		// 선택 문의유형 설정
+		$('#counselClsf').val(counselClsf);
 		var actionUrl = '/callcenter/onetoone/qna/answer/template/' + counselClsf;
 		$.get(actionUrl
 			, function(data) {
@@ -233,10 +236,16 @@
 		// 입력 값 체크
 		if (!gagajf.validation('#qnaForm'))
 			return false;
-		if($('#questContent').val().length<20){
+
+		if ($('#questContent').val().length<20){
 			mcxDialog.alert("문의내용을 20자 이상 입력해주세요.");
 			return;
 		}
+
+		if (gagajf.isNull($('#counselClsf').val())) {
+			mcxDialog.alert("문의유형은 필수 항목입니다.");
+			return;
+		}
 		mcxDialog.confirm("저장하시겠습니까?", {
 			cancelBtnText: "취소",
 			sureBtnText: "확인",

src/main/webapp/WEB-INF/views/web/display/BestMainFormWeb.html

@@ -253,6 +253,9 @@
 				tag += '				<img alt="BLUE-a" class=" vLHTC pd_img" src="' + _uploadGoodsUrl + '/' + item.sysImgNm + '">\n';
 				tag += '			</div>\n';
 				tag += '			<p class="itemBrand">'+item.brandGroupNm+'</p>\n';
+				if (item.goodsTnm != null && item.goodsTnm != '') {
+					tag+='					<div class="itemComment">'+item.goodsTnm+'</div>\n';
+				}
 				tag += '			<div class="itemName">'+item.goodsFullNm+'</div>\n';
 				tag += '			<p class="itemPrice">'+item.currPrice.addComma();
 				if (item.currPrice != item.listPrice) {
@@ -296,9 +299,7 @@
 					}
 					tag += '	</p>';
 				}
-				if (item.goodsTnm != null && item.goodsTnm != '') {
-					tag+='					<div class="itemComment">'+item.goodsTnm+'</div>\n';
-				}
+				
 				tag += '		</a>\n';
 				tag += '	</div>\n';
 				tag += '</div>\n';

src/main/webapp/WEB-INF/views/web/display/BrandMainFormWeb.html

@@ -199,8 +199,8 @@
 															<img alt="BLACK-a" class="vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + goodsData.sysImgNm.replace('https:', '').replace('//image.istyle24.com/Upload/ProductImage/','')}" onerror="noneImg(this)">
 														</div>
 														<p class="itemBrand" th:text="${goodsData.brandGroupNm}"></p>
-														<div class="itemName" th:text="${goodsData.goodsFullNm}"></div>
 														<div class="itemComment" th:unless="${goodsData.goodsTnm == null or goodsData.goodsTnm == ''}" th:text="${goodsData.goodsTnm}">#가을느낌 물씬!!</div>
+														<div class="itemName" th:text="${goodsData.goodsFullNm}"></div>
 														<p th:unless="${goodsData.goodsType=='G056_D'}" class="itemPrice">
 															[[${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')} + 원]]
 															<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}"></span>
@@ -281,9 +281,9 @@
 														</th:block>
 														<img alt="BLACK-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + goodsData.sysImgNm.replace('https:', '').replace('//image.istyle24.com/Upload/ProductImage/','')}" onerror="noneImg(this)">
 													</div>
-													<p class=" itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
-													<div class=" itemName" th:text="${goodsData.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+													<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 													<div class="itemComment" th:unless="${goodsData.goodsTnm == null or goodsData.goodsTnm == ''}" th:text="${goodsData.goodsTnm}">#베이직 셔츠의 정수1</div>
+													<div class="itemName" th:text="${goodsData.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
 													<p th:unless="${goodsData.goodsType=='G056_D'}" class="itemPrice" >
 														[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')} + 원]]
 														<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
@@ -390,9 +390,9 @@
 													</th:block>
 													<img alt="BLACK-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + goodsData.sysImgNm}" onerror="noneImg(this)">
 												</div>
-												<p class=" itemBrand" th:text="${goodsData.brandGroupNm}"></p>
-												<div class="itemName" th:text="${goodsData.goodsFullNm}"></div>
+												<p class="itemBrand" th:text="${goodsData.brandGroupNm}"></p>
 												<div class="itemComment" th:unless="${goodsData.goodsTnm == null or goodsData.goodsTnm == ''}" th:text="${goodsData.goodsTnm}">#가을느낌 물씬!</div>
+												<div class="itemName" th:text="${goodsData.goodsFullNm}"></div>
 												<p th:unless="${goodsData.goodsType=='G056_D'}" class="itemPrice">[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')} + 원]]
 													<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 													<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>

src/main/webapp/WEB-INF/views/web/display/CategoryMainFormWeb.html

@@ -152,8 +152,8 @@
 												<img class="vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + item.sysImgNm.replace('https:', '').replace('//image.istyle24.com/Upload/ProductImage/','')}" th:alt="${item.goodsCd}" onerror="noneImg(this)"/>
 											</div>
 											<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
-											<div class="itemName" th:text="${item.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
 											<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
+											<div class="itemName" th:text="${item.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
 											<p th:unless="${item.goodsType=='G056_D'}" class="itemPrice">
 												<span th:text="${#numbers.formatInteger(item.currPrice,3,'COMMA') + '원'}">80,100</span>
 												<span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA') + '원'}">89,000</span>

src/main/webapp/WEB-INF/views/web/display/OutletMainFormWeb.html

@@ -105,13 +105,13 @@
 												<img alt="BLUE-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + item.sysImgNm.replace('https:', '').replace('//image.istyle24.com/Upload/ProductImage/','')}" th:alt="${item.goodsCd}"/>
 											</div>
 											<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
+											<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
 											<div class="itemName" th:text="${item.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
 											<p  th:unless="${item.goodsType=='G056_D'}" class="itemPrice">[[${#numbers.formatInteger(item.currPrice,0,'COMMA')} + 원]]
 												<span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>
 												<span class=" itemPercent" th:if="${item.currPrice != item.listPrice}" th:text="${(item.listPrice == 0 ? 0 : #numbers.formatDecimal((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 											</p>
 											<p  th:if="${item.goodsType=='G056_D'}" class="itemPrice">[[${#numbers.formatInteger(item.currPrice,0,'COMMA')} + '원 ~']]</p>
-											<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
 										</a>
 									</div>
 								</div>
@@ -149,6 +149,7 @@
 											<img alt="BLUE-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + item.sysImgNm.replace('https:', '').replace('//image.istyle24.com/Upload/ProductImage/','')}">
 										</div>
 										<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
+										<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
 										<div class="itemName" th:text="${item.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
 										<p th:unless="${item.goodsType=='G056_D'}" class="itemPrice">[[${#numbers.formatInteger(item.currPrice,0,'COMMA')} + 원]]
 											<span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>
@@ -166,7 +167,6 @@
 												<span class="badge13" th:if="${idx.index<3}" th:value="${iconArray[0]}" th:text="${iconArray[1]}"></span>
 											</th:block>
 										</p>
-										<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
 									</a>
 								</div>
 							</div>

src/main/webapp/WEB-INF/views/web/display/SearchSampleFormWeb.html

@@ -3124,6 +3124,7 @@
 											<img alt="" class="vLHTC pd_img" src="//image.istyle24.com/Style24/images/pc/thumb/tmp_pdTogether1.jpg">
 										</div>
 										<p class="itemBrand">BRAND NAME1</p>
+										<div class="itemComment">#주문 폭주 상품</div>
 										<div class="itemName">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
 										<p class="itemPrice">80,100
 											<span class="itemPrice_original">89,000</span>
@@ -3137,7 +3138,6 @@
 											<span class="chip_color54" value="BDS">BLACK</span>
 											<span class="chip_color40" value="YBR">WHITE</span>
 										</div>
-										<div class="itemComment">#주문 폭주 상품</div>
 									</a>
 								</div>
 							</div>

src/main/webapp/WEB-INF/views/web/planning/PlanningShotGuideFormWeb.html

@@ -136,6 +136,9 @@ if(shotBrandList.length>0){
 				html += '                                 <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item2.sysImgNm +'">';
 				html += '                             </div>';
 				html += '                             <p class="itemBrand">'+item2.brandNm+'</p>';
+				if(item2.goodsTnm != null){
+					html += '						  <div class="itemComment">'+item2.goodsTnm+'</div>';
+				}
 				html += '                             <div class="itemName">'+item2.goodsNm+'</div>';
 				html += '                             <p class="itemPrice">'+item2.currPrice.addComma();
 				if (item2.currPrice != item2.listPrice) {
@@ -181,9 +184,7 @@ if(shotBrandList.length>0){
 					}
 					html += '	</p>';
 				}
-				if(item2.goodsTnm != null){
-					html += '			<div class="itemComment">'+item2.goodsTnm+'</div>';
-				}
+				
 				html += '                         </a>';
 				html += '                     </div>';
 				html += '                 </div>';

src/main/webapp/WEB-INF/views/web/social/SocialMainFormWeb.html

@@ -155,6 +155,9 @@ let fnGetSocialList = function(result) {
 		html += '            </div>\n';
 		html += '            <div class="itemSpecialPrice"><span>특가</span></div>\n';
 		html += '            <p class="itemBrand">'+item.brandGroupNm+'</p>\n';
+		if(item.goodsTnm != null){
+			html += '           <div class="itemComment">'+item.goodsTnm+'</div>\n';
+		}
 		html += '            <div class="itemName">'+item.goodsNm+'</div>\n';
 		html += '            <p class="itemPrice">\n';
 		html += item.currPrice.addComma() +'원';
@@ -165,9 +168,7 @@ let fnGetSocialList = function(result) {
 			html += '                                 <span class=" itemPercent">'+item.dcRate.addComma()+'%</span>\n';
 		}
 		html += '            </p>\n';
-		if(item.goodsTnm != null){
-			html += '           <div class="itemComment">'+item.goodsTnm+'</div>\n';
-		}
+		
 		html += '        </a>\n';
 		if (item.goodsType == 'G056_N') {
 			html += '        	 <div class="shopBagBtn">\n';

src/main/webapp/biz/mypage.js

@@ -357,8 +357,16 @@ var fnChangeDeliveryMemo = function(param) {
 
 // 신용카드 전표 및 현금영수증 버튼 클릭 이벤트
 var fnReceipt = function(param) {
-	let receiptWin = kcpReceiptUrl;
+	let receiptWin = '';
 	let option = '';
+
+	// APP일때 추가
+	if (_isApp != null && _isApp == 'true') {
+		receiptWin = 'public://?link=';
+	}
+
+	receiptWin += kcpReceiptUrl;
+
 	if (param == 'card') {
 		let order_no = ordNo;
 		if (!gagajf.isNull(paymentInfo.ordChgSq)) {
@@ -408,7 +416,12 @@ var fnReceipt = function(param) {
 	}
 
 	// 팝업 생성
-	window.open(receiptWin, "", option);
+	// APP일때 추가
+	if (_isApp != null && _isApp == 'true') {
+		location.href = receiptWin;
+	} else {
+		window.open(receiptWin, "", option);
+	}
 }
 
 // 문자열 길이를 체크