| Line 914... |
Line 914... |
| 914 |
}
|
914 |
}
|
| 915 |
List<PendingOrderItem> pendingOrderItem = null;
|
915 |
List<PendingOrderItem> pendingOrderItem = null;
|
| 916 |
|
916 |
|
| 917 |
if (isAdmin) {
|
917 |
if (isAdmin) {
|
| 918 |
|
918 |
|
| 919 |
pendingOrderItem = pendingOrderItemRepository.selectOrderItemByStatus(OrderStatus.PENDING);
|
919 |
pendingOrderItem = pendingOrderItemRepository.selectOrderItemByStatus(OrderStatus.PROCESSING);
|
| 920 |
|
920 |
|
| 921 |
} else {
|
921 |
} else {
|
| 922 |
pendingOrderItem = pendingOrderItemRepository.selectOrderItemByStatusAndFofoId(OrderStatus.PENDING,
|
922 |
pendingOrderItem = pendingOrderItemRepository.selectOrderItemByStatusAndFofoId(OrderStatus.PROCESSING,
|
| 923 |
loginDetails.getFofoId());
|
923 |
loginDetails.getFofoId());
|
| 924 |
}
|
924 |
}
|
| 925 |
|
925 |
|
| 926 |
Map<String, Object> map = pendingOrderService.getItemOrders(pendingOrderItem, loginDetails.getFofoId());
|
926 |
Map<String, Object> map = pendingOrderService.getItemOrders(pendingOrderItem, loginDetails.getFofoId());
|
| 927 |
|
927 |
|
| Line 1091... |
Line 1091... |
| 1091 |
PendingOrder pendingOrder = pendingOrderRepository.selectById(pendingOrderItem.getOrderId());
|
1091 |
PendingOrder pendingOrder = pendingOrderRepository.selectById(pendingOrderItem.getOrderId());
|
| 1092 |
|
1092 |
|
| 1093 |
List<OrderStatus> status = pendingOrderItemRepository.selectByOrderId(pendingOrderItem.getOrderId()).stream()
|
1093 |
List<OrderStatus> status = pendingOrderItemRepository.selectByOrderId(pendingOrderItem.getOrderId()).stream()
|
| 1094 |
.map(x -> x.getStatus()).collect(Collectors.toList());
|
1094 |
.map(x -> x.getStatus()).collect(Collectors.toList());
|
| 1095 |
|
1095 |
|
| 1096 |
if (!status.contains(OrderStatus.PENDING) && !status.contains(OrderStatus.BILLED)
|
1096 |
if (!status.contains(OrderStatus.PENDING) && !status.contains(OrderStatus.PROCESSING)
|
| 1097 |
&& !status.contains(OrderStatus.UNSETTLED) && !status.contains(OrderStatus.CLAIMED)) {
|
1097 |
&& !status.contains(OrderStatus.BILLED) && !status.contains(OrderStatus.UNSETTLED)
|
| - |
|
1098 |
&& !status.contains(OrderStatus.CLAIMED)) {
|
| 1098 |
pendingOrder.setStatus(OrderStatus.CLOSED);
|
1099 |
pendingOrder.setStatus(OrderStatus.CLOSED);
|
| 1099 |
}
|
1100 |
}
|
| 1100 |
pendingOrderItemRepository.persist(pendingOrderItem);
|
1101 |
pendingOrderItemRepository.persist(pendingOrderItem);
|
| 1101 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
1102 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
| 1102 |
|
1103 |
|
| Line 1149... |
Line 1150... |
| 1149 |
|
1150 |
|
| 1150 |
emailService.sendMailWithAttachments("Order Delivered with SmartDukaan", "order-delivered.vm", emailModel,
|
1151 |
emailService.sendMailWithAttachments("Order Delivered with SmartDukaan", "order-delivered.vm", emailModel,
|
| 1151 |
customerEmail, null, null);
|
1152 |
customerEmail, null, null);
|
| 1152 |
|
1153 |
|
| 1153 |
}
|
1154 |
}
|
| 1154 |
if (!status.contains(OrderStatus.PENDING) && !status.contains(OrderStatus.BILLED)
|
1155 |
if (!status.contains(OrderStatus.PENDING) && !status.contains(OrderStatus.PROCESSING)
|
| 1155 |
&& !status.contains(OrderStatus.UNSETTLED) && !status.contains(OrderStatus.CLAIMED))
|
1156 |
&& !status.contains(OrderStatus.BILLED) && !status.contains(OrderStatus.UNSETTLED)
|
| - |
|
1157 |
&& !status.contains(OrderStatus.CLAIMED))
|
| 1156 |
|
1158 |
|
| 1157 |
{
|
1159 |
{
|
| 1158 |
pendingOrder.setStatus(OrderStatus.CLOSED);
|
1160 |
pendingOrder.setStatus(OrderStatus.CLOSED);
|
| 1159 |
}
|
1161 |
}
|
| 1160 |
pendingOrderItemRepository.persist(pendingOrderItem);
|
1162 |
pendingOrderItemRepository.persist(pendingOrderItem);
|