Merge branch 'develop' into bin2107

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

@@ -480,6 +480,7 @@ public class TsfOrderController extends TsfBaseController {
 		ModelAndView mav = new ModelAndView();
 		mav.addObject("order"				, order);									// 파라미터
 		mav.addObject("isLogin"				, TsfSession.isLogin());					// 로그인여부
+		mav.addObject("frontGb"				, TsfSession.getFrontGb());					// 디바이스구분
 		mav.setViewName(super.getDeviceViewName("order/OrderGiftInfo"));
 		
 		return mav;

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

@@ -2189,10 +2189,10 @@
 		let $target = $obj.parent().parent().parent().find('.swiper-container').find('.item_prod');
 		let goodsSize = $target.length;
 		let btnType = "C";
-		let params = [];
 		let goodsIdx = 0;
 		
 		$target.each(function(){
+			let params = [];
 			goodsIdx ++; 
 			if ($(this).hasClass('unable')) {
 				

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

@@ -51,7 +51,7 @@
 											</thead>
 											<tbody>
 												<th:block th:each="measurement, status : ${measurementList}" th:if="${status.first}">
-												<th:block th:if="${typeCd == '상의'}">
+												<th:block th:if="${measurement.typecd == '상의'}">
 												<tr>
 													<td scope="col">가슴둘레</td>
 												</tr>
@@ -65,8 +65,7 @@
 													<td scope="col">총길이</td>
 												</tr>
 												</th:block>
-												<th:block th:unless="${typeCd == '상의'}">
-												</th:block>
+												<th:block th:unless="${measurement.typecd == '상의'}">
 												<tr>
 													<td scope="col">허리둘레</td>
 												</tr>
@@ -119,7 +118,8 @@
 												</tr>
 											</thead>
 											<tbody>
-												<tr th:each="measurement, status : ${measurementList}" th:if="${not status.first}">
+												<th:block th:each="measurement, status : ${measurementList}" th:with="count=${(measurement.typecd =='상의')? 4: 5}">
+												<tr th:if="${not status.first and status.index <= count}">
 													<td th:if="${measurement.size1}" th:text="${measurement.size1}">95</td>
 													<td th:if="${measurement.size2}" th:text="${measurement.size2}">95</td>
 													<td th:if="${measurement.size3}" th:text="${measurement.size3}">95</td>
@@ -133,6 +133,7 @@
 													<td th:if="${measurement.size11}" th:text="${measurement.size11}">95</td>
 													<td th:if="${measurement.size12}" th:text="${measurement.size12}">95</td>
 												</tr>
+												</th:block>
 											</tbody>
 										</table>
 									</div>

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

@@ -576,6 +576,12 @@ var orderGiftInfoSet = function() {
 				} else {
 					$(this).parent().parent().find("input[name=recipNm]").attr("readOnly", true);
 					$(this).parent().parent().find("input[name=recipPhnno]").attr("readOnly", true);
+					
+					// 2021.06.03
+					window.style24.getContact();
+					// 데이타테스트
+					//var obj = {"contact" : {"name" : "홍길동", "phnno" : "010-1234-0000"}}
+					//contactInfo(obj);
 				}
 			});
 			
@@ -585,6 +591,12 @@ var orderGiftInfoSet = function() {
 	});
 }
 
+// 2021.06.03 어플 callback 함수 호출
+var contactInfo = function(jsonString) {
+	$("#orderForm #orderGiftInfo input[name=recipNm]").val(jsonString.contact.name);
+	$("#orderForm #orderGiftInfo input[name=recipPhnno]").val(jsonString.contact.phnno);
+}
+
 // 1.4.2 배송정보로드
 var deliveryAddrInfoSet = function(delvObj, temp) {
 	

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

@@ -27,22 +27,56 @@
 						</div>
 					</a>
 				</div>
+				
 				<div class="fold_cont" style="display: none;">
-					<div class="inner"><!-- 210419_ : 모바일웹에서만 .inner 사용 -->
-						<div class="form_field">
-							<div class="input_wrap">
-								<input type="text" name="recipNm" class="form_control" value="" maxlength="10" placeholder="받는 분">
+					<!-- 210419_ : 모바일웹에서만 .inner 사용 -->
+					<th:block th:unless="${frontGb} == 'A'">
+						<div class="inner">
+							<div class="form_field">
+								<div class="input_wrap">
+									<input type="text" name="recipNm" class="form_control" value="" maxlength="10" placeholder="받는 분">
+								</div>
+								<div class="input_wrap">
+									<input type="text" name="recipPhnno" class="form_control" value="" minlength="10" maxlength="14" placeholder="받는 분 휴대폰번호">
+									<p class="desc_txt">선물이 타인에게 전송될수 있으니 받으실분 연락처를 정확하게 입력해주세요.</p> <!-- 210421_삭제 : 전화번호를 텍스트 삭제 -->
+								</div>
+								<div class="textarea_wrap">
+									<textarea class="doc_review" name="review" id="giftMsg" placeholder="선물 메시지 입력&#13;&#10;(미 입력시 ‘감사합니다’로 발송됩니다.)"></textarea>
+									<p class="txt_cnt"><span id="review_cnt" class="c_primary">0</span>/200</p>
+								</div>
 							</div>
-							<div class="input_wrap">
-								<input type="text" name="recipPhnno" class="form_control" value="" minlength="10" maxlength="14" placeholder="받는 분 휴대폰번호">
-								<p class="desc_txt">선물이 타인에게 전송될수 있으니 받으실분 연락처를 정확하게 입력해주세요.</p> <!-- 210421_삭제 : 전화번호를 텍스트 삭제 -->
-							</div>
-							<div class="textarea_wrap">
-								<textarea class="doc_review" name="review" id="giftMsg" placeholder="선물 메시지 입력&#13;&#10;(미 입력시 ‘감사합니다’로 발송됩니다.)"></textarea>
-								<p class="txt_cnt"><span id="review_cnt" class="c_primary">0</span>/200</p>
+						</div>
+					</th:block>
+					
+					<!-- 210419_ : APP 전용 : 탭 전체/ '연락처불러오기'는 모바일웹에서 사용하지않음. -->
+					<th:block th:if="${frontGb} == 'A'">
+						<div class="tabWrap">
+							<ul class="tabIndex">
+								<li class="" value="Call"><a href="javascript:void(0);"><span>연락처 불러오기</span></a></li>
+								<li class="active" value="Direct"><a href="javascript:void(0);"><span>직접입력</span></a></li>
+							</ul>
+							
+							<div class="tabContents">
+								<div class="form_field">
+									<div class="tab_cont active">
+										<div class="input_wrap">
+											<input type="text" name="recipNm" class="form_control" value="" maxlength="10" placeholder="받는 분">
+										</div>
+										<div class="form_field">
+											<div class="input_wrap">
+												<input type="text" name="recipPhnno" class="form_control" value="" minlength="10" maxlength="14" placeholder="받으실분 휴대폰번호">
+												<p class="desc_txt">선물이 타인에게 전송될수 있으니 전화번호를 받으실분 연락처를 정확하게 입력해주세요.</p>
+											</div>
+											<div class="textarea_wrap">
+												<textarea class="doc_review" name="review" id="giftMsg" placeholder="선물 메시지 입력&#13;&#10;(미 입력시 ‘감사합니다’로 발송됩니다.)"></textarea>
+												<p class="txt_cnt"><span id="review_cnt" class="c_primary">0</span>/200</p>
+											</div>
+										</div>
+									</div>
+								</div>
 							</div>
 						</div>
-					</div>
+					</th:block>
 				</div>
 				<!-- //주문고객정보 -->
 			</li>

src/main/webapp/WEB-INF/views/web/goods/GoodsDetailFormWeb.html

@@ -1564,9 +1564,9 @@
 		let $target = $obj.parent().find('.li_item').find('.item_prod');
 		let goodsSize = $target.length;
 		let btnType = "C";
-		let params = [];
 		let goodsIdx = 0;
 		$target.each(function(){
+			let params = [];
 			goodsIdx ++; 
 			if ($(this).hasClass('unable')) {
 				

src/main/webapp/WEB-INF/views/web/goods/GoodsSizeInfoFormWeb.html

@@ -51,7 +51,7 @@
 											</thead>
 											<tbody>
 												<th:block th:each="measurement, status : ${measurementList}" th:if="${status.first}">
-												<th:block th:if="${typeCd == '상의'}">
+												<th:block th:if="${measurement.typecd == '상의'}">
 												<tr>
 													<td scope="col">가슴둘레</td>
 												</tr>
@@ -65,8 +65,7 @@
 													<td scope="col">총길이</td>
 												</tr>
 												</th:block>
-												<th:block th:unless="${typeCd == '상의'}">
-												</th:block>
+												<th:block th:unless="${measurement.typecd == '상의'}">
 												<tr>
 													<td scope="col">허리둘레</td>
 												</tr>
@@ -83,6 +82,7 @@
 													<td scope="col">총길이</td>
 												</tr>
 												</th:block>
+												</th:block>
 											</tbody>
 										</table>
 									</div>
@@ -103,7 +103,7 @@
 												<col th:if="${measurement.size12}" th:attr="width=${typeWith+'%'}">
 											</colgroup>
 											<thead>
-												<tr th:each="measurement, status : ${measurementList}" th:if="${status.first}" th:with="sizeCount=${measurement.sizeCount}">
+												<tr th:each="measurement, status : ${measurementList}" th:if="${status.first}" >
 													<th scope="col" th:if="${measurement.size1}" th:text="${measurement.size1}">M</th>
 													<th scope="col" th:if="${measurement.size2}" th:text="${measurement.size2}">M</th>
 													<th scope="col" th:if="${measurement.size3}" th:text="${measurement.size3}">M</th>
@@ -119,7 +119,8 @@
 												</tr>
 											</thead>
 											<tbody>
-												<tr th:each="measurement, status : ${measurementList}" th:if="${not status.first}">
+												<th:block th:each="measurement, status : ${measurementList}" th:with="count=${(measurement.typecd =='상의')? 4: 5}">
+												<tr th:if="${not status.first and status.index <= count}">
 													<td th:if="${measurement.size1}" th:text="${measurement.size1}">95</td>
 													<td th:if="${measurement.size2}" th:text="${measurement.size2}">95</td>
 													<td th:if="${measurement.size3}" th:text="${measurement.size3}">95</td>
@@ -133,6 +134,7 @@
 													<td th:if="${measurement.size11}" th:text="${measurement.size11}">95</td>
 													<td th:if="${measurement.size12}" th:text="${measurement.size12}">95</td>
 												</tr>
+												</th:block>
 											</tbody>
 										</table>
 									</div>