fix : 배송조회(운송장번호 조회) - 발송 예정 문구 수정

src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/DlvyInqireR.jsp

@@ -28,6 +28,8 @@
         border: 1px solid #dee2e6 !important;
     }
 </style>
+<jsp:useBean id="nowDate" class="java.util.Date" />
+<fmt:formatDate var="currentTime" value="${nowDate}" pattern="yyyy-MM-dd HH:mm:ss" />
 <!-- 배송 조회 -->
 <div id="delivery-check-pop" class="modal default" style="max-width: 640px;">
 	<div class="modal-header">
@@ -56,7 +58,16 @@
 							</tr>
 							<tr>
 								<th>수령인</th>
-								<td><c:out value="${ podInfo.recipient }"/></td>
+								<td>
+									<c:choose>
+										<c:when test="${ podInfo.recipient eq 'null' }">
+											<c:out value="${ ordrInfo.shippingList[0].recpntNm }"/>
+										</c:when>
+										<c:otherwise>
+											<c:out value="${ podInfo.recipient }"/>
+										</c:otherwise>
+									</c:choose>
+								</td>
 							</tr>
 						</tbody>
 					</table>
@@ -85,8 +96,16 @@
 									<td><c:out value="${ podInfo.dateLocalwhin }"/></td>
 									<td></td>
 									<td>
-										발송물이 픽업되어, 공항출항 대기중입니다.
+										<c:choose>
-										<p class="statusEn">Shipment pick up and waiting at the origin airport</p>
+											<c:when test="${ podInfo.dateLocalwhin > currentTime }">
+												발송물이 픽업(예정)되어, 공항출항 대기중입니다.
+												<p class="statusEn">Shipment pick up(expected) and waiting at the origin airport</p>
+											</c:when>
+											<c:otherwise>
+												발송물이 픽업되어, 공항출항 대기중입니다.
+												<p class="statusEn">Shipment pick up and waiting at the origin airport</p>
+											</c:otherwise>
+										</c:choose>
 									</td>
 								</tr>
 							</c:if>
@@ -95,8 +114,16 @@
 									<td><c:out value="${ podInfo.dateLocaldeparture }"/></td>
 									<td></td>
 									<td>
-										화물이 인천공항으로 출발하였습니다.
+										<c:choose>
-										<p class="statusEn">Shipment departed to Incheon International Airport</p>
+											<c:when test="${ podInfo.dateLocaldeparture > currentTime }">
+												화물이 인천공항으로 출발(예정)하였습니다.
+												<p class="statusEn">Shipment departed(expected) to Incheon International Airport</p>
+											</c:when>
+											<c:otherwise>
+												화물이 인천공항으로 출발하였습니다.
+												<p class="statusEn">Shipment departed to Incheon International Airport</p>
+											</c:otherwise>
+										</c:choose>
 									</td>
 								</tr>
 							</c:if>
@@ -105,8 +132,16 @@
 									<td><c:out value="${ podInfo.dateIcnarrival }"/></td>
 									<td>인천공항</td>
 									<td>
-										화물이 인천공항에 도착하였습니다.
+										<c:choose>
-										<p class="statusEn">Shipped the goods arrived at Incheon International Airport.</p>
+											<c:when test="${ podInfo.dateLocaldeparture > currentTime }">
+												화물이 인천공항에 도착(예정)하였습니다.
+												<p class="statusEn">Shipped the goods arrived(expected) at Incheon International Airport.</p>
+											</c:when>
+											<c:otherwise>
+												화물이 인천공항에 도착하였습니다.
+												<p class="statusEn">Shipped the goods arrived at Incheon International Airport.</p>
+											</c:otherwise>
+										</c:choose>
 									</td>
 								</tr>
 							</c:if>
@@ -115,8 +150,16 @@
 									<td><c:out value="${ podInfo.dateCustomes }"/></td>
 									<td>인천공항</td>
 									<td>
-										인천공항 세관에서 통관완료되었습니다.
+										<c:choose>
-										<p class="statusEn">Customs clearance is completed in the Republic of Korea</p>
+											<c:when test="${ podInfo.dateLocaldeparture > currentTime }">
+												인천공항 세관에서 통관완료(예정)되었습니다.
+												<p class="statusEn">Customs clearance is completed(expected) in the Republic of Korea</p>
+											</c:when>
+											<c:otherwise>
+												인천공항 세관에서 통관완료되었습니다.
+												<p class="statusEn">Customs clearance is completed in the Republic of Korea</p>
+											</c:otherwise>
+										</c:choose>
 									</td>
 								</tr>
 							</c:if>