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

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

@@ -44,7 +44,7 @@
 								<th:block th:if="${orderInfo.payMeans} == 'G014_20'">
 									<div>
 										<dt>무통장입금정보</dt>
-										<dd><span th:text="${orderInfo.cardNm}"></span>(<span th:text="${orderInfo.ordNm}"></span>)&nbsp;/&nbsp;<span th:text="${orderInfo.vaBank}"></span></dd>
+										<dd><span th:text="${orderInfo.cardNm}"></span>(<span th:text="${orderInfo.ordNm}"></span>)&nbsp;/&nbsp;<span th:text="${orderInfo.vaNo}"></span></dd>
 									</div>
 									<div class="closedate">
 										<dt>입금마감</dt>
@@ -214,13 +214,20 @@
 												<!-- 신용카드 일때 -->
 												<div>
 													<dt class="sr-only">결제방법</dt>
-													<th:block th:if="${orderInfo.cardType} == 'Y'">
-														<dd th:if="!${orderInfo.cardNm}" th:text="|체크카드(${orderInfo.payType})|"></dd>
+													<!-- kcp 신용카드 -->
+													<th:block th:if="${orderInfo.payMeans} == 'G014_30'">
+														<!--  체크카드 -->
+														<th:block th:if="${orderInfo.cardType} == 'Y'">
+															<dd th:text="|체크카드(${orderInfo.cardNm})/${orderInfo.cardMips}|"></dd>
+														</th:block>
+														<!--  신용카드 -->
+														<th:block th:if="${orderInfo.cardType} == 'N'">
+															<dd th:text="|신용카드(${orderInfo.cardNm})/${orderInfo.cardMips}|"></dd>
+														</th:block>
 													</th:block>
-													<th:block th:if="${orderInfo.cardType} == 'N'">
-														<dd th:if="!${orderInfo.cardNm}" th:text="|신용카드(${orderInfo.payType})|"></dd>
+													<th:block th:if="${orderInfo.payMeans} != 'G014_30'">
+														<dd th:text="${orderInfo.payType}"></dd>
 													</th:block>
-													<dd th:if="${orderInfo.cardNm}" th:text="${orderInfo.cardNm}"></dd>
 												</div>
 												<!-- //신용카드 일때 -->
 											</dl>