| Line 801... |
Line 801... |
| 801 |
|
801 |
|
| 802 |
Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
|
802 |
Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
|
| 803 |
|
803 |
|
| 804 |
List<PendingOrder> pendingOrder = null;
|
804 |
List<PendingOrder> pendingOrder = null;
|
| 805 |
if (isAdmin) {
|
805 |
if (isAdmin) {
|
| 806 |
pendingOrder = pendingOrderRepository.selectAllByStatus("pending");
|
806 |
pendingOrder = pendingOrderRepository.selectAllByStatus("open");
|
| 807 |
model.addAttribute("customRetailersMap", customRetailersMap);
|
807 |
model.addAttribute("customRetailersMap", customRetailersMap);
|
| 808 |
} else {
|
808 |
} else {
|
| 809 |
pendingOrder = pendingOrderRepository.selectByFofoId(loginDetails.getFofoId(), "pending");
|
809 |
pendingOrder = pendingOrderRepository.selectByFofoId(loginDetails.getFofoId(), "open");
|
| 810 |
}
|
810 |
}
|
| 811 |
model.addAttribute("pendingOrder", pendingOrder);
|
811 |
model.addAttribute("pendingOrder", pendingOrder);
|
| - |
|
812 |
model.addAttribute("isAdmin", roleManager.isAdmin(loginDetails.getRoleIds()));
|
| 812 |
return "pending_fofo_order";
|
813 |
return "pending_fofo_order";
|
| 813 |
}
|
814 |
}
|
| 814 |
|
815 |
|
| 815 |
@GetMapping("/getPendingOrderItem")
|
816 |
@GetMapping("/getPendingOrderItem")
|
| 816 |
public String getPendingOrderItem(HttpServletRequest request, @RequestParam int orderId, Model model)
|
817 |
public String getPendingOrderItem(HttpServletRequest request, @RequestParam int orderId, Model model)
|
| Line 830... |
Line 831... |
| 830 |
|
831 |
|
| 831 |
LOGGER.info("inventoryMap" + inventoryMap);
|
832 |
LOGGER.info("inventoryMap" + inventoryMap);
|
| 832 |
model.addAttribute("pendingOrderItems", pendingOrderItems);
|
833 |
model.addAttribute("pendingOrderItems", pendingOrderItems);
|
| 833 |
model.addAttribute("itemMap", itemMap);
|
834 |
model.addAttribute("itemMap", itemMap);
|
| 834 |
model.addAttribute("inventoryMap", inventoryMap);
|
835 |
model.addAttribute("inventoryMap", inventoryMap);
|
| - |
|
836 |
model.addAttribute("isAdmin", roleManager.isAdmin(loginDetails.getRoleIds()));
|
| 835 |
return "pending-order-item";
|
837 |
return "pending-order-item";
|
| 836 |
}
|
838 |
}
|
| - |
|
839 |
|
| - |
|
840 |
@RequestMapping(value = "/cancelPendingOrder", method = RequestMethod.POST)
|
| - |
|
841 |
public String cancelPendingOrder(HttpServletRequest request, @RequestParam int id, Model model) throws Exception {
|
| - |
|
842 |
PendingOrder pendingOrder = pendingOrderRepository.selectById(id);
|
| - |
|
843 |
|
| - |
|
844 |
List<PendingOrderItem> pendingOrderItem = pendingOrderItemRepository.selectByOrderId(id);
|
| - |
|
845 |
for (PendingOrderItem poi : pendingOrderItem) {
|
| - |
|
846 |
poi.setStatus("cancelled");
|
| - |
|
847 |
|
| - |
|
848 |
}
|
| - |
|
849 |
pendingOrder.setStatus("closed");
|
| - |
|
850 |
|
| - |
|
851 |
pendingOrderRepository.persist(pendingOrder);
|
| - |
|
852 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
| - |
|
853 |
|
| - |
|
854 |
return "response";
|
| - |
|
855 |
}
|
| - |
|
856 |
|
| - |
|
857 |
@RequestMapping(value = "/cancelPendingOrderItem", method = RequestMethod.POST)
|
| - |
|
858 |
public String cancelPendingOrderItem(HttpServletRequest request, @RequestParam int id, Model model)
|
| - |
|
859 |
throws Exception {
|
| - |
|
860 |
PendingOrderItem pendingOrderItem = pendingOrderItemRepository.selectById(id);
|
| - |
|
861 |
|
| - |
|
862 |
pendingOrderItem.setStatus("cancelled");
|
| - |
|
863 |
PendingOrder pendingOrder = pendingOrderRepository.selectById(pendingOrderItem.getId());
|
| - |
|
864 |
|
| - |
|
865 |
List<String> status = pendingOrderItemRepository.selectByOrderId(pendingOrderItem.getOrderId()).stream()
|
| - |
|
866 |
.map(x -> x.getStatus()).collect(Collectors.toList());
|
| - |
|
867 |
|
| - |
|
868 |
if (!status.contains("pending")) {
|
| - |
|
869 |
pendingOrder.setStatus("closed");
|
| - |
|
870 |
}
|
| - |
|
871 |
pendingOrderItemRepository.persist(pendingOrderItem);
|
| - |
|
872 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
| - |
|
873 |
|
| - |
|
874 |
return "response";
|
| - |
|
875 |
}
|
| 837 |
}
|
876 |
}
|