Merge remote-tracking branch 'origin/ST24PRJ-333(무료배송)' into develop

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

@@ -181,7 +181,7 @@
 																<th>제공받는 자</th>
 																<td>
 																	<th:block th:each="delvFeeCd, i : ${delvFeeCdList}">
-																		<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' || ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
+																		<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' or ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
 																			<th:block th:if="${i.count == #lists.size(delvFeeCdList)}">
 																				<th:block th:text="|${delvFeeCd.supplyCompNm}|"></th:block>
 																			</th:block>

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

@@ -265,7 +265,7 @@
 													<th>제공받는 자</th>
 													<td>
 														<th:block th:each="delvFeeCd, i : ${delvFeeCdList}">
-															<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS'">
+															<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' or ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
 																<th:block th:if="${i.count == #lists.size(delvFeeCdList)}">
 																	<th:block th:text="|${delvFeeCd.supplyCompNm}|"></th:block>
 																</th:block>
@@ -355,7 +355,7 @@
 													<th>제공받는 자</th>
 													<td>
 														<th:block th:each="delvFeeCd, i : ${delvFeeCdList}">
-															<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS'">
+															<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' or ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
 																<th:block th:if="${i.count == #lists.size(delvFeeCdList)}">
 																	<th:block th:text="|${delvFeeCd.supplyCompNm}|"></th:block>
 																</th:block>

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

@@ -101,7 +101,7 @@
 															<tr>
 																<td>
 																	<th:block th:each="delvFeeCd, i : ${delvFeeCdList}">
-																		<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' || ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
+																		<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' or ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
 																			<th:block th:if="${i.count == #lists.size(delvFeeCdList)}">
 																				<th:block th:text="|${delvFeeCd.supplyCompNm}|"></th:block>
 																			</th:block>

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

@@ -257,7 +257,7 @@
 														<tr class="paymentinfo">
 															<td>
 																<th:block th:each="delvFeeCd, i : ${delvFeeCdList}">
-																	<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS'">
+																	<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' or ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
 																		<th:block th:if="${i.count == #lists.size(delvFeeCdList)}">
 																			<th:block th:text="|${delvFeeCd.supplyCompNm}|"></th:block>
 																		</th:block>
@@ -325,7 +325,7 @@
 														<tr class="paymentinfo">
 															<td>
 																<th:block th:each="delvFeeCd, i : ${delvFeeCdList}">
-																	<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS'">
+																	<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' or ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
 																		<th:block th:if="${i.count == #lists.size(delvFeeCdList)}">
 																			<th:block th:text="|${delvFeeCd.supplyCompNm}|"></th:block>
 																		</th:block>