Merge branch 'develop' into #2021-09-06-pub

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

@@ -15,6 +15,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thymeleaf.util.StringUtils;
 
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.parameter.GagaParameterUtil;
 import com.style24.core.biz.dao.TscEnvsetDao;
 import com.style24.core.biz.service.TscKcpService;
 import com.style24.core.biz.service.TscOrderService;
@@ -31,9 +33,6 @@ import com.style24.persistence.domain.Order;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.parameter.GagaParameterUtil;
-
 /**
  * 장바구니 Service
  *
@@ -1024,7 +1023,7 @@ public class TsfCartService {
 
 		// 자사 배송비 등록
 		if (params.size() > 0) {
-			if (wmsSumPrice > wmsMinOrdAmt) {
+			if (wmsSumPrice >= wmsMinOrdAmt) {
 				order.setWmsDelvFee(0);
 			} else {
 				order.setWmsDelvFee(wmsDelvFee);

src/main/resources/i18n/messages/message_ko_KR.properties

@@ -92,7 +92,7 @@ SABANGNET_0010=\uCD9C\uACE0\uB97C \uC704\uD574 ERP\uB85C \uC804\uC1A1\uD558\uC60
 
 #\uCFE0\uD3F0
 COUPON_0001=\uCD1D {0}\uC7A5\uC758 \uCFE0\uD3F0\uC744 \uB2E4\uC6B4\uB85C\uB4DC \uD558\uC600\uC2B5\uB2C8\uB2E4.
-COUPON_0002=\uC774\uBBF8 \uB2E4\uC6B4\uB85C\uB4DC\uB97C \uC644\uB8CC \uD558\uC168\uC2B5\uB2C8\uB2E4.
+COUPON_0002=\uBC1B\uC744 \uCFE0\uD3F0\uC774 \uC5C6\uC2B5\uB2C8\uB2E4. 1\uAC74 \uAD6C\uB9E4 \uD558\uC2DC\uACE0 \uB2E4\uC74C\uB2EC \uB4F1\uAE09 \uCFE0\uD3F0\uC744 \uBC1B\uC544\uBCF4\uC138\uC694!
 
 #\uAD50\uD658
 EXCHANGE_0001=\uAD50\uD658 \uC2E0\uCCAD\uC774 \uC811\uC218\uB418\uC5C8\uC2B5\uB2C8\uB2E4.

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

@@ -53,12 +53,12 @@
 </div>
 <script th:inline="javascript">
 	/*<![CDATA[*/
-	let custAppAgreeYn;
-	let custMkAgreeYn;
-	let phoneAppAgreeYn;
-	let phoneMkAgreeYn;
-	let custNo;
-	let returnUrl;
+	let ysCustAppAgreeYn;
+	let ysCustMkAgreeYn;
+	let ysPhoneAppAgreeYn;
+	let ysPhoneMkAgreeYn;
+	let ysCustNo;
+	let ysReturnUrl;
 
 	$('#btnAgree').on('click', function () {
 		let jsonData = JSON.stringify({});
@@ -133,12 +133,12 @@
 	var fnReloadAfterLogin = function(result) {
 		if (result.status === 'OK') {
 			if (_isApp === 'true') {
-				custAppAgreeYn = result.appAgreeYn;
-				custMkAgreeYn = result.mkAgreeYn;
-				custNo = result.custNo;
-				returnUrl = result.returnUrl;
+				ysCustAppAgreeYn = result.appAgreeYn;
+				ysCustMkAgreeYn = result.mkAgreeYn;
+				ysCustNo = result.custNo;
+				ysReturnUrl = result.returnUrl;
 				setTimeout(function () {
-					document.location.href = "idsend://?id=" + custNo + "^link=" + returnUrl;
+					document.location.href = "idsend://?id=" + ysCustNo + "^link=" + ysReturnUrl;
 				}, 1000); // 정보성 PUSH, 마케팅 PUSH 수신여부 확인이 정상적으로 처리되지 않을 때
 				fnIsPushEnable(); // 정보성 PUSH, 마케팅 PUSH 수신여부 확인
 			} else {
@@ -158,9 +158,9 @@
 	// 앱에서 호출되는 함수(앱푸시)
 	var settingsSwitchPush = function(onOff) {
 		if (onOff === 'ON') {
-			phoneAppAgreeYn = 'Y';
+			ysPhoneAppAgreeYn = 'Y';
 		} else if (onOff === 'OFF'){
-			phoneAppAgreeYn = 'N';
+			ysPhoneAppAgreeYn = 'N';
 		}
 		fnIsAdEnable();
 	}
@@ -168,17 +168,17 @@
 	// 앱에서 호출되는 함수(마케팅동의)
 	var settingsSwitchAdvertise = function (onOff) {
 		if (onOff === 'ON') {
-			phoneMkAgreeYn = 'Y';
+			ysPhoneMkAgreeYn = 'Y';
 		} else if (onOff === 'OFF'){
-			phoneMkAgreeYn = 'N';
+			ysPhoneMkAgreeYn = 'N';
 		}
 
 		// 기기에 등록된 정보성 PUSH, 마케팅 PUSH 수신여부와
 		// 고객DB 수신여부 비교 후 다르면 기기에 등록된 데이터로 업데이트
-		if (phoneAppAgreeYn !== custAppAgreeYn || phoneMkAgreeYn !== custMkAgreeYn ) {
-			fnUpdatePush(phoneAppAgreeYn, phoneMkAgreeYn);
+		if (ysPhoneAppAgreeYn !== ysCustAppAgreeYn || ysPhoneMkAgreeYn !== ysCustMkAgreeYn ) {
+			fnUpdatePush(ysPhoneAppAgreeYn, ysPhoneMkAgreeYn);
 		}
-		document.location.href = "idsend://?id=" + custNo + "^link=" + returnUrl;
+		document.location.href = "idsend://?id=" + ysCustNo + "^link=" + ysReturnUrl;
 	}
 
 	// 정보성 PUSH ON, OFF 여부 확인

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

@@ -456,7 +456,7 @@ var fnMypageOrderListInfiniteScrollInit = function(){
 		
 		let params = JSON.stringify({});
 		gagajf.ajaxJsonSubmit(url, params, function(result) {
-			let message = '이미 다운로드를 완료 하셨습니다.';
+			let message = '받을 쿠폰이 없습니다. 1건 구매 하시고 다음달 등급 쿠폰을 받아보세요!';
 			if (result.isDownload) {
 				message = '총 ' + result.downloadCnt + '장의 쿠폰을 다운로드 하였습니다.';
 			}

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

@@ -62,7 +62,6 @@
 										</span>
 									</label>
 								</li>
-								<!-- 
 								<th:block th:if="${order.giftPackYn} == 'N'">
 									<li>
 										<input type="radio" name="rdi-paynormal" id="payVirtualBank" class="KCP" value="KCP|G014_20"> 
@@ -71,7 +70,6 @@
 										</label>
 									</li>
 								</th:block>
-								 -->
 								<li>
 									<input type="radio" name="rdi-paynormal" id="payPayco" class="PAYCO" value="PAYCO|G014_30"> 
 									<label for="payPayco">

src/main/webapp/WEB-INF/views/web/mypage/MypageOrderListFormWeb.html

@@ -354,7 +354,7 @@
 
 		let params = JSON.stringify({});
 		gagajf.ajaxJsonSubmit(url, params, function(result) {
-			let message = '이미 다운로드를 완료 하셨습니다.';
+			let message = '받을 쿠폰이 없습니다. 1건 구매 하시고 다음달 등급 쿠폰을 받아보세요!';
 			if (result.isDownload) {
 				message = '총 ' + result.downloadCnt + '장의 쿠폰을 다운로드 하였습니다.';
 			}

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

@@ -70,12 +70,10 @@
 						<input type="radio" name="rdi-paynormal" id="payRealBank" class="KCP" value="KCP|G014_10"> 
 						<label for="payRealBank"><span class="payType">실시간계좌이체</span></label>
 					</li>
-					<!-- 
 					<li>
 						<input type="radio" name="rdi-paynormal" id="payVirtualBank" class="KCP" value="KCP|G014_20"> 
 						<label for="payVirtualBank"><span class="payType">무통장입금</span></label>
 					</li>
-					 -->
 				</ul>
 			</div>
 		</div>