Merge remote-tracking branch 'origin/xodud1202' into order

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

@@ -69,6 +69,21 @@
 				<button type="button" class="btn btn_default btn_sm" onclick="deleteCart('SELECT', 'cart')"><span>선택삭제</span></button>
 			</div>
 		</div>
+
+		<div class="inner" th:if="${order.shotCartList.size() < 1 and order.wmsCartList.size() < 1 and order.delvCartList.size() < 1}">
+			<!-- STYLE24 배송 -->
+			<div class="part_goods">
+				<div class="nodata">
+					<div class="txt_box">
+						<p>
+							쇼핑백에 담긴 상품이 없습니다.
+						</p>
+					</div>
+				</div>
+			</div>
+			<!-- //STYLE24 배송 -->
+		</div>
+
 		<div class="inner" th:if="${order.shotCartList.size() > 0 or order.wmsCartList.size() > 0}">
 			<!-- STYLE24 배송 -->
 			<div class="part_goods">
@@ -680,7 +695,7 @@
 					loginInfo = result;
 
 					if (!loginInfo || loginInfo.custNo == null || loginInfo.custNo == 0) {
-						$("#cartListForm .area_salecoupon").hide();
+						$("#cartListForm .area_salecoupon").parent().hide();
 					}
 				});
 			};