| 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.PROCESSING);
|
919 |
pendingOrderItem = pendingOrderItemRepository.selectUnverifiedOrder(OrderStatus.PROCESSING);
|
| 920 |
|
920 |
|
| 921 |
} else {
|
921 |
} else {
|
| 922 |
pendingOrderItem = pendingOrderItemRepository.selectOrderItemByStatusAndFofoId(OrderStatus.PROCESSING,
|
922 |
pendingOrderItem = pendingOrderItemRepository.selectOrderItemByStatusAndFofoId(OrderStatus.PROCESSING,
|
| 923 |
loginDetails.getFofoId());
|
923 |
loginDetails.getFofoId());
|
| 924 |
}
|
924 |
}
|
| Line 931... |
Line 931... |
| 931 |
}
|
931 |
}
|
| 932 |
model.addAttribute("isAdmin", isAdmin);
|
932 |
model.addAttribute("isAdmin", isAdmin);
|
| 933 |
return "pending_fofo_order";
|
933 |
return "pending_fofo_order";
|
| 934 |
}
|
934 |
}
|
| 935 |
|
935 |
|
| - |
|
936 |
@GetMapping("/verifiedOrders")
|
| - |
|
937 |
public String getVerifiedOrders(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
|
| - |
|
938 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| - |
|
939 |
boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
|
| - |
|
940 |
List<Integer> fofoIds = fofoStoreRepository.selectActiveStores().stream().map(x -> x.getId())
|
| - |
|
941 |
.collect(Collectors.toList());
|
| - |
|
942 |
|
| - |
|
943 |
Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
|
| - |
|
944 |
model.addAttribute("customRetailersMap", customRetailersMap);
|
| - |
|
945 |
|
| - |
|
946 |
List<PendingOrderItem> pendingOrderItem = null;
|
| - |
|
947 |
|
| - |
|
948 |
if (isAdmin) {
|
| - |
|
949 |
pendingOrderItem = pendingOrderItemRepository.selectVerifiedOrder(OrderStatus.PROCESSING);
|
| - |
|
950 |
}
|
| - |
|
951 |
|
| - |
|
952 |
Map<String, Object> map = pendingOrderService.getItemOrders(pendingOrderItem, loginDetails.getFofoId());
|
| - |
|
953 |
|
| - |
|
954 |
model.addAttribute("pendingOrderItem", map.get("pendingOrderItem"));
|
| - |
|
955 |
|
| - |
|
956 |
model.addAttribute("isAdmin", isAdmin);
|
| - |
|
957 |
return "verified_order_item";
|
| - |
|
958 |
}
|
| - |
|
959 |
|
| 936 |
@GetMapping("/billedOrders")
|
960 |
@GetMapping("/billedOrders")
|
| 937 |
public String getBilledOrders(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
|
961 |
public String getBilledOrders(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
|
| 938 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
962 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 939 |
boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
|
963 |
boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
|
| 940 |
|
964 |
|
| Line 1182... |
Line 1206... |
| 1182 |
|
1206 |
|
| 1183 |
return "response";
|
1207 |
return "response";
|
| 1184 |
}
|
1208 |
}
|
| 1185 |
|
1209 |
|
| 1186 |
@RequestMapping(value = "/verifyOrderItem", method = RequestMethod.POST)
|
1210 |
@RequestMapping(value = "/verifyOrderItem", method = RequestMethod.POST)
|
| 1187 |
|
- |
|
| 1188 |
public String verifyOrderItem(HttpServletRequest request, @RequestParam int id, Model model) throws Exception {
|
1211 |
public String verifyOrderItem(HttpServletRequest request, @RequestParam int id, Model model) throws Exception {
|
| 1189 |
|
1212 |
|
| 1190 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
1213 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 1191 |
PendingOrderItem pendingOrderItem = pendingOrderItemRepository.selectById(id);
|
1214 |
PendingOrderItem pendingOrderItem = pendingOrderItemRepository.selectById(id);
|
| 1192 |
pendingOrderItem.setVerifiedTimestamp(LocalDateTime.now());
|
1215 |
pendingOrderItem.setVerifiedTimestamp(LocalDateTime.now());
|
| - |
|
1216 |
|
| - |
|
1217 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
| - |
|
1218 |
|
| 1193 |
return "response";
|
1219 |
return "response";
|
| 1194 |
}
|
1220 |
}
|
| 1195 |
|
1221 |
|
| 1196 |
@RequestMapping(value = "/cancelOrderByInvoice", method = RequestMethod.POST)
|
1222 |
@RequestMapping(value = "/cancelOrderByInvoice", method = RequestMethod.POST)
|
| 1197 |
public String cancelOrder(HttpServletRequest request, @RequestParam List<String> invoiceNumbers, Model model)
|
1223 |
public String cancelOrder(HttpServletRequest request, @RequestParam List<String> invoiceNumbers, Model model)
|